clientv3/snapshot: cleanup initIndex

clientv3/snapshot/util.go

@@ -16,7 +16,6 @@ package snapshot
 
 import (
 	"encoding/binary"
-	"go.etcd.io/etcd/mvcc/backend"
 )
 
 type revision struct {
@@ -30,10 +29,3 @@ func bytesToRev(bytes []byte) revision {
 		sub:  int64(binary.BigEndian.Uint64(bytes[9:])),
 	}
 }
-
-// initIndex implements ConsistentIndexGetter so the snapshot won't block
-// the new raft instance by waiting for a future raft index.
-type initIndex int
-
-func (i *initIndex) ConsistentIndex() uint64 { return uint64(*i) }
-func (i *initIndex) Save(backend.BatchTx)    {}

clientv3/snapshot/v3_snapshot.go

@@ -34,6 +34,7 @@ import (
 	"go.etcd.io/etcd/etcdserver/api/membership"
 	"go.etcd.io/etcd/etcdserver/api/snap"
 	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/cindex"
 	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"go.etcd.io/etcd/lease"
 	"go.etcd.io/etcd/mvcc"
@@ -384,7 +385,9 @@ func (s *v3Manager) saveDB() error {
 	// a lessor never timeouts leases
 	lessor := lease.NewLessor(s.lg, be, lease.LessorConfig{MinLeaseTTL: math.MaxInt64})
 
-	mvs := mvcc.NewStore(s.lg, be, lessor, (*initIndex)(&commit), mvcc.StoreConfig{CompactionBatchLimit: math.MaxInt32})
+	ci := cindex.NewConsistentIndex()
+	ci.SetConsistentIndex(uint64(commit))
+	mvs := mvcc.NewStore(s.lg, be, lessor, &ci, mvcc.StoreConfig{CompactionBatchLimit: math.MaxInt32})
 	txn := mvs.Write(traceutil.TODO())
 	btx := be.BatchTx()
 	del := func(k, v []byte) error {