vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

migrate: convert 0.4 terms to start at 1

release-2.0
Barak Michener 2015-01-27 13:10:13 -05:00
parent 915c22292f
commit 7f91a35313
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migrate/etcd4.go
View File

@ -29,6 +29,8 @@ import (
"github.com/coreos/etcd/wal/walpb" "github.com/coreos/etcd/wal/walpb"
) )
const termOffset4to2 = 1
func snapDir4(dataDir string) string { func snapDir4(dataDir string) string {
return path.Join(dataDir, "snapshot") return path.Join(dataDir, "snapshot")
} }

2
migrate/log.go
View File

@ -498,7 +498,7 @@ func toEntry2(ent4 *etcd4pb.LogEntry, raftMap map[string]uint64) (*raftpb.Entry,
} }
ent2 := raftpb.Entry{ ent2 := raftpb.Entry{
Term: ent4.GetTerm(), Term: ent4.GetTerm() + termOffset4to2,
Index: ent4.GetIndex(), Index: ent4.GetIndex(),
Type: cmd4.Type2(), Type: cmd4.Type2(),
Data: data, Data: data,

2
migrate/snapshot.go
View File

@ -195,7 +195,7 @@ func (s *Snapshot4) Snapshot2() *raftpb.Snapshot {
Data: newState, Data: newState,
Metadata: raftpb.SnapshotMetadata{ Metadata: raftpb.SnapshotMetadata{
Index: s.LastIndex, Index: s.LastIndex,
Term: s.LastTerm, Term: s.LastTerm + termOffset4to2,
ConfState: raftpb.ConfState{ ConfState: raftpb.ConfState{
Nodes: nodeList, Nodes: nodeList,
}, },