Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdutl: include for lastsnapshot

Browse Source 
Signed-off-by: fykaa <faeka6@gmail.com>
This commit is contained in:
fykaa 2024-05-29 16:06:42 +05:30
parent cb83f93095
commit 3815ab0ce9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etcdutl/etcdutl/migrate_command.go
View File

@ -95,11 +95,11 @@ func (o *migrateOptions) Config() (*migrateConfig, error) {
c.be = backend.NewDefaultBackend(GetLogger(), dbPath)
walPath := datadir.ToWALDir(o.dataDir)
lastSnapshot, err := getLastSnapshotIndex(walPath)
lastSnapshot, err := getLastSnapshot(c.lg, walPath)
if err != nil {
return nil, fmt.Errorf(`failed to find last snapshot: %v`, err)
c.lg.Warn("failed to find last snapshot, falling back to beginning of wal", zap.Error(err))
}
w, err := wal.OpenForRead(c.lg, walPath, walpb.Snapshot{Index: lastSnapshot})
w, err := wal.OpenForRead(c.lg, walPath, lastSnapshot)
if err != nil {
return nil, fmt.Errorf(`failed to open wal: %v`, err)
}
@ -161,15 +161,13 @@ func storageVersionToString(ver *semver.Version) string {
return fmt.Sprintf("%d.%d", ver.Major, ver.Minor)
}
func getLastSnapshotIndex(walPath string) (uint64, error) {
walSnaps, err := wal.ValidSnapshotEntries(nil, walPath)
func getLastSnapshot(lg *zap.Logger, walPath string) (walpb.Snapshot, error) {
walSnaps, err := wal.ValidSnapshotEntries(lg, walPath)
if err != nil {
return 0, err
return walpb.Snapshot{}, err
}
if len(walSnaps) == 0 {
return 0, fmt.Errorf("no valid snapshot entries found")
return walpb.Snapshot{}, fmt.Errorf("no valid snapshot entries found")
}
snapshot := walSnaps[len(walSnaps)-1]
return snapshot.Index, nil
return walSnaps[len(walSnaps)-1], nil
}