Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/storage/raft_storage/raft_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ func (e *raftStatePersistence) loadOrBootstrap(initialPeers []uint64) error {
}

e.hardState = &raftpb.HardState{}
e.confState = &raftpb.ConfState{Nodes: peers}
e.confState = &raftpb.ConfState{Voters: peers}
e.snapshot = &raftpb.Snapshot{Metadata: &raftpb.SnapshotMetadata{ConfState: cloneConfState(e.confState)}}
return e.db.Update(func(txn *badger.Txn) error {
if err := txn.Set(e.key(initializedSuffix), []byte{1}); err != nil {
Expand Down
96 changes: 76 additions & 20 deletions proto/pkg/raftpb/raftpb.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions proto/proto/raftpb.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ option go_package = "github.com/Aetherance/kv/proto/pkg/raftpb;raftpb";
enum EntryType {
EntryNormal = 0;
EntryConfChange = 1;
// Reserved for the future joint-consensus implementation. Simple
// one-at-a-time changes continue to use EntryConfChange.
EntryConfChangeV2 = 2;
}

message Entry {
Expand Down Expand Up @@ -61,12 +64,23 @@ message HardState {
}

message ConfState {
repeated uint64 nodes = 1;
// Field 1 used to be named "nodes". Renaming it is wire compatible and
// makes the voting role explicit.
repeated uint64 voters = 1;
repeated uint64 learners = 2;

// These fields mirror etcd/raft's ConfState layout so joint consensus can
// be added without another durable-format migration.
repeated uint64 voters_outgoing = 3;
repeated uint64 learners_next = 4;
bool auto_leave = 5;
}

enum ConfChangeType {
AddNode = 0;
RemoveNode = 1;
AddNode = 0;
RemoveNode = 1;
UpdateNode = 2;
AddLearnerNode = 3;
}

message ConfChange {
Expand Down
Loading
Loading