From 2b6fd3094ff34950155848887cd295a6e55f6b94 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 23 Jan 2018 15:56:07 -0800 Subject: [PATCH] *: rename "snap" to "raftsnap" package Signed-off-by: Gyuho Lee --- contrib/raftexample/kvstore.go | 10 +++++----- contrib/raftexample/raft.go | 14 +++++++------- etcdctl/ctlv2/command/backup_command.go | 8 ++++---- etcdctl/ctlv3/command/migrate_command.go | 6 +++--- scripts/genproto.sh | 2 +- snapshot/v3_snapshot.go | 4 ++-- tools/etcd-dump-logs/main.go | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index d877bc7ad..d4df7b3c0 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" ) // a key-value store backed by raft @@ -29,7 +29,7 @@ type kvstore struct { proposeC chan<- string // channel for proposing updates mu sync.RWMutex kvStore map[string]string // current committed key-value pairs - snapshotter *snap.Snapshotter + snapshotter *raftsnap.Snapshotter } type kv struct { @@ -37,7 +37,7 @@ type kv struct { Val string } -func newKVStore(snapshotter *snap.Snapshotter, proposeC chan<- string, commitC <-chan *string, errorC <-chan error) *kvstore { +func newKVStore(snapshotter *raftsnap.Snapshotter, proposeC chan<- string, commitC <-chan *string, errorC <-chan error) *kvstore { s := &kvstore{proposeC: proposeC, kvStore: make(map[string]string), snapshotter: snapshotter} // replay log into key-value map s.readCommits(commitC, errorC) @@ -67,10 +67,10 @@ func (s *kvstore) readCommits(commitC <-chan *string, errorC <-chan error) { // done replaying log; new data incoming // OR signaled to load snapshot snapshot, err := s.snapshotter.Load() - if err == snap.ErrNoSnapshot { + if err == raftsnap.ErrNoSnapshot { return } - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && err != raftsnap.ErrNoSnapshot { log.Panic(err) } log.Printf("loading snapshot at term %d and index %d", snapshot.Metadata.Term, snapshot.Metadata.Index) diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index 2b7f3207a..f26c0bb40 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -30,7 +30,7 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" ) @@ -59,8 +59,8 @@ type raftNode struct { raftStorage *raft.MemoryStorage wal *wal.WAL - snapshotter *snap.Snapshotter - snapshotterReady chan *snap.Snapshotter // signals when snapshotter is ready + snapshotter *raftsnap.Snapshotter + snapshotterReady chan *raftsnap.Snapshotter // signals when snapshotter is ready snapCount uint64 transport *rafthttp.Transport @@ -77,7 +77,7 @@ var defaultSnapCount uint64 = 10000 // commit channel, followed by a nil message (to indicate the channel is // current), then new log entries. To shutdown, close proposeC and read errorC. func newRaftNode(id int, peers []string, join bool, getSnapshot func() ([]byte, error), proposeC <-chan string, - confChangeC <-chan raftpb.ConfChange) (<-chan *string, <-chan error, <-chan *snap.Snapshotter) { + confChangeC <-chan raftpb.ConfChange) (<-chan *string, <-chan error, <-chan *raftsnap.Snapshotter) { commitC := make(chan *string) errorC := make(chan error) @@ -98,7 +98,7 @@ func newRaftNode(id int, peers []string, join bool, getSnapshot func() ([]byte, httpstopc: make(chan struct{}), httpdonec: make(chan struct{}), - snapshotterReady: make(chan *snap.Snapshotter, 1), + snapshotterReady: make(chan *raftsnap.Snapshotter, 1), // rest of structure populated after WAL replay } go rc.startRaft() @@ -188,7 +188,7 @@ func (rc *raftNode) publishEntries(ents []raftpb.Entry) bool { func (rc *raftNode) loadSnapshot() *raftpb.Snapshot { snapshot, err := rc.snapshotter.Load() - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && err != raftsnap.ErrNoSnapshot { log.Fatalf("raftexample: error loading snapshot (%v)", err) } return snapshot @@ -261,7 +261,7 @@ func (rc *raftNode) startRaft() { log.Fatalf("raftexample: cannot create dir for snapshot (%v)", err) } } - rc.snapshotter = snap.New(rc.snapdir) + rc.snapshotter = raftsnap.New(rc.snapdir) rc.snapshotterReady <- rc.snapshotter oldwal := wal.Exist(rc.waldir) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 82e61d8ab..a2112a76a 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -29,7 +29,7 @@ import ( "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" @@ -102,14 +102,14 @@ func handleBackup(c *cli.Context) error { } func saveSnap(destSnap, srcSnap string) (walsnap walpb.Snapshot) { - ss := snap.New(srcSnap) + ss := raftsnap.New(srcSnap) snapshot, err := ss.Load() - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && err != raftsnap.ErrNoSnapshot { log.Fatal(err) } if snapshot != nil { walsnap.Index, walsnap.Term = snapshot.Metadata.Index, snapshot.Metadata.Term - newss := snap.New(destSnap) + newss := raftsnap.New(destSnap) if err = newss.SaveSnap(*snapshot); err != nil { log.Fatal(err) } diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 48c17c8ab..4e2858a88 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -36,7 +36,7 @@ import ( "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" @@ -134,9 +134,9 @@ func rebuildStoreV2() (store.Store, uint64) { } snapdir := filepath.Join(migrateDatadir, "member", "snap") - ss := snap.New(snapdir) + ss := raftsnap.New(snapdir) snapshot, err := ss.Load() - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && err != raftsnap.ErrNoSnapshot { ExitWithError(ExitError, err) } diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 004079570..253c5a6c4 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -16,7 +16,7 @@ if [[ $(protoc --version | cut -f2 -d' ') != "3.5.1" ]]; then fi # directories containing protos to be built -DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb" +DIRS="./wal/walpb ./etcdserver/etcdserverpb ./raftsnap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb" # exact version of packages to build GOGO_PROTO_SHA="41168f6614b7bb144818ec8967b8c702705df564" diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index fdde5dace..89d3fea0f 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -38,7 +38,7 @@ import ( "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" @@ -420,7 +420,7 @@ func (s *v3Manager) saveWALAndSnap() error { }, }, } - sn := snap.New(s.snapDir) + sn := raftsnap.New(s.snapDir) if err := sn.SaveSnap(raftSnap); err != nil { return err } diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index fb72be100..c1a1e2bb8 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -25,7 +25,7 @@ import ( "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" ) @@ -57,10 +57,10 @@ func main() { walsnap.Index = *index } else { if *snapfile == "" { - ss := snap.New(snapDir(dataDir)) + ss := raftsnap.New(snapDir(dataDir)) snapshot, err = ss.Load() } else { - snapshot, err = snap.Read(filepath.Join(snapDir(dataDir), *snapfile)) + snapshot, err = raftsnap.Read(filepath.Join(snapDir(dataDir), *snapfile)) } switch err { @@ -69,7 +69,7 @@ func main() { nodes := genIDSlice(snapshot.Metadata.ConfState.Nodes) fmt.Printf("Snapshot:\nterm=%d index=%d nodes=%s\n", walsnap.Term, walsnap.Index, nodes) - case snap.ErrNoSnapshot: + case raftsnap.ErrNoSnapshot: fmt.Printf("Snapshot:\nempty\n") default: log.Fatalf("Failed loading snapshot: %v", err)