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

Merge pull request #12906 from ptabor/20210429-etcdctl-v2-backup-cindex-fix

Browse Source 
20210429 etcdctl v2 backup cindex fix
This commit is contained in:
Piotr Tabor
2021-04-29 18:01:45 +02:00
committed by GitHub
parent e908ef3da9 e90504fe62
commit 835643e6e2
16 changed files with 207 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etcdctl/ctlv3/command/migrate_command.go
View File

@@ -36,6 +36,7 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver/cindex"
"go.etcd.io/etcd/server/v3/mvcc"
"go.etcd.io/etcd/server/v3/mvcc/backend"
"go.etcd.io/etcd/server/v3/wal"
@@ -91,7 +92,7 @@ func migrateCommandFunc(cmd *cobra.Command, args []string) {
}()
readKeys(reader, be)
mvcc.UpdateConsistentIndex(be, index)
cindex.UpdateConsistentIndex(be.BatchTx(), index)
err := <-errc
if err != nil {
fmt.Println("failed to transform keys")