update bootstrap to not recover v2store #16470
Conversation
| @@ -28,7 28,7 @@ const ( | |||
| // ability to rollback to etcd v3.5. | |||
| V2_DEPR_2_GONE = V2DeprecationEnum("gone") | |||
|
|
|||
| V2_DEPR_DEFAULT = V2_DEPR_1_WRITE_ONLY | |||
| V2_DEPR_DEFAULT = V2_DEPR_1_WRITE_ONLY_DROP | |||
There was a problem hiding this comment.
v3.6 should not drop v2 entries as it would break downgrade to v3.5
| @@ -378,7 376,7 @@ func bootstrapClusterWithWAL(cfg config.ServerConfig, meta *snapshotMetadata) (* | |||
| }, nil | |||
| } | |||
|
|
|||
| func recoverSnapshot(cfg config.ServerConfig, st v2store.Store, be backend.Backend, beExist bool, beHooks *serverstorage.BackendHooks, ci cindex.ConsistentIndexer, ss *snap.Snapshotter) (*raftpb.Snapshot, backend.Backend, error) { | |||
| func recoverSnapshot(cfg config.ServerConfig, be backend.Backend, beExist bool, beHooks *serverstorage.BackendHooks, ci cindex.ConsistentIndexer, ss *snap.Snapshotter) (*raftpb.Snapshot, backend.Backend, error) { | |||
| // Find a snapshot to start/restart a raft node | |||
| walSnaps, err := wal.ValidSnapshotEntries(cfg.Logger, cfg.WALDir()) | |||
There was a problem hiding this comment.
v3.6 should bootstrap from db and not last snapshot
|
|
||
| if err = serverstorage.AssertNoV2StoreContent(cfg.Logger, st, cfg.V2Deprecation); err != nil { | ||
| cfg.Logger.Error("illegal v2store content", zap.Error(err)) | ||
| if err = serverstorage.AssertV2DeprecationStage(cfg.Logger, cfg.V2Deprecation); err != nil { |
There was a problem hiding this comment.
v3.6 should continue to generate snapshot files to ensure v3.5 backward compatibility.
| lg.Info("restoring v2 store") | ||
| if err := s.v2store.Recovery(toApply.snapshot.Data); err != nil { | ||
| lg.Panic("failed to restore v2 store", zap.Error(err)) | ||
| if err := serverstorage.AssertV2DeprecationStage(lg, s.Cfg.V2Deprecation); err != nil { |
There was a problem hiding this comment.
We should just not restore v2store when we get it in snapshot. We still expect to get v2store in snapshot when we upgrade v3.5->v3.6 or downgrade.
| if err != nil { | ||
| return err | ||
| func AssertV2DeprecationStage(lg *zap.Logger, deprecationStage config.V2DeprecationEnum) error { | ||
| //supported stages are "write-only-drop-data" and "gone" |
There was a problem hiding this comment.
For backward compatibility we need to keep write-only
|
This issue has been automatically marked as stale because it has not had recent activity. It will be closed after 21 days if no further activity occurs. Thank you for your contributions. |
|
PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.