From dee39bf78617ff75b0923fee0068409ef728f542 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 24 Jan 2018 10:36:04 -0800 Subject: [PATCH] internal/raftsnap: move "raftsnap" to internal Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 2 +- contrib/raftexample/kvstore.go | 2 +- contrib/raftexample/raft.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 2 +- etcdserver/backend.go | 2 +- etcdserver/server.go | 2 +- etcdserver/server_test.go | 2 +- etcdserver/snapshot_merge.go | 2 +- etcdserver/storage.go | 2 +- etcdserver/util_test.go | 2 +- {raftsnap => internal/raftsnap}/db.go | 0 {raftsnap => internal/raftsnap}/doc.go | 0 {raftsnap => internal/raftsnap}/message.go | 0 {raftsnap => internal/raftsnap}/metrics.go | 0 {raftsnap => internal/raftsnap}/snappb/snap.pb.go | 0 {raftsnap => internal/raftsnap}/snappb/snap.proto | 0 {raftsnap => internal/raftsnap}/snapshotter.go | 2 +- {raftsnap => internal/raftsnap}/snapshotter_test.go | 0 rafthttp/http.go | 2 +- rafthttp/http_test.go | 2 +- rafthttp/peer.go | 2 +- rafthttp/snapshot_sender.go | 2 +- rafthttp/snapshot_test.go | 2 +- rafthttp/transport.go | 2 +- snapshot/v3_snapshot.go | 2 +- tools/etcd-dump-logs/main.go | 2 +- 27 files changed, 20 insertions(+), 20 deletions(-) rename {raftsnap => internal/raftsnap}/db.go (100%) rename {raftsnap => internal/raftsnap}/doc.go (100%) rename {raftsnap => internal/raftsnap}/message.go (100%) rename {raftsnap => internal/raftsnap}/metrics.go (100%) rename {raftsnap => internal/raftsnap}/snappb/snap.pb.go (100%) rename {raftsnap => internal/raftsnap}/snappb/snap.proto (100%) rename {raftsnap => internal/raftsnap}/snapshotter.go (99%) rename {raftsnap => internal/raftsnap}/snapshotter_test.go (100%) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index c9717fcc3..e5d5253de 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -19,7 +19,7 @@ - Move `cmd/vendor` directory to `vendor` at repository root. - Remove recursive symlinks in `cmd` directory. - Now `go get/install/build` on `etcd` packages (e.g. `clientv3`, `tools/benchmark`) enforce builds with etcd `vendor` directory. -- Rename `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/raftsnap"`](https://github.com/coreos/etcd/pull/9211). +- Rename `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/internal/raftsnap"`](https://github.com/coreos/etcd/pull/9211). ### Added(API) diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index d4df7b3c0..077d4959f 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "github.com/coreos/etcd/raftsnap" + "github.com/coreos/etcd/internal/raftsnap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index f26c0bb40..c53c6f1f5 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -25,12 +25,12 @@ import ( "time" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" ) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index a2112a76a..0a8714cd2 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -25,11 +25,11 @@ import ( "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 4e2858a88..f9e28ebad 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -30,13 +30,13 @@ import ( "github.com/coreos/etcd/etcdserver/api" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" diff --git a/etcdserver/backend.go b/etcdserver/backend.go index 2dffdd74e..b66c549a1 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,11 +19,11 @@ import ( "os" "time" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" ) func newBackend(cfg ServerConfig) backend.Backend { diff --git a/etcdserver/server.go b/etcdserver/server.go index 62e58f5e7..4bf6eded8 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -38,6 +38,7 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/mvcc" @@ -52,7 +53,6 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" "github.com/coreos/etcd/version" "github.com/coreos/etcd/wal" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 10b3e8e82..6ae4f6d10 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -28,6 +28,7 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" @@ -43,7 +44,6 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" ) diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index 01eb96547..b238b4c55 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" ) // createMergedSnapshotMessage creates a snapshot message that contains: raft status (term, conf), diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 8e38814bc..b567c518c 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -18,10 +18,10 @@ import ( "io" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" ) diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index e0b75454c..7c07bcd19 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/raftsnap" ) func TestLongestConnected(t *testing.T) { diff --git a/raftsnap/db.go b/internal/raftsnap/db.go similarity index 100% rename from raftsnap/db.go rename to internal/raftsnap/db.go diff --git a/raftsnap/doc.go b/internal/raftsnap/doc.go similarity index 100% rename from raftsnap/doc.go rename to internal/raftsnap/doc.go diff --git a/raftsnap/message.go b/internal/raftsnap/message.go similarity index 100% rename from raftsnap/message.go rename to internal/raftsnap/message.go diff --git a/raftsnap/metrics.go b/internal/raftsnap/metrics.go similarity index 100% rename from raftsnap/metrics.go rename to internal/raftsnap/metrics.go diff --git a/raftsnap/snappb/snap.pb.go b/internal/raftsnap/snappb/snap.pb.go similarity index 100% rename from raftsnap/snappb/snap.pb.go rename to internal/raftsnap/snappb/snap.pb.go diff --git a/raftsnap/snappb/snap.proto b/internal/raftsnap/snappb/snap.proto similarity index 100% rename from raftsnap/snappb/snap.proto rename to internal/raftsnap/snappb/snap.proto diff --git a/raftsnap/snapshotter.go b/internal/raftsnap/snapshotter.go similarity index 99% rename from raftsnap/snapshotter.go rename to internal/raftsnap/snapshotter.go index 228f1f6fb..7ebd6fd3e 100644 --- a/raftsnap/snapshotter.go +++ b/internal/raftsnap/snapshotter.go @@ -25,11 +25,11 @@ import ( "strings" "time" + "github.com/coreos/etcd/internal/raftsnap/snappb" pioutil "github.com/coreos/etcd/pkg/ioutil" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap/snappb" "github.com/coreos/pkg/capnslog" ) diff --git a/raftsnap/snapshotter_test.go b/internal/raftsnap/snapshotter_test.go similarity index 100% rename from raftsnap/snapshotter_test.go rename to internal/raftsnap/snapshotter_test.go diff --git a/rafthttp/http.go b/rafthttp/http.go index 156345465..c3c095f7c 100644 --- a/rafthttp/http.go +++ b/rafthttp/http.go @@ -23,10 +23,10 @@ import ( "path" "strings" + "github.com/coreos/etcd/internal/raftsnap" pioutil "github.com/coreos/etcd/pkg/ioutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/version" ) diff --git a/rafthttp/http_test.go b/rafthttp/http_test.go index d3ae81104..44622c814 100644 --- a/rafthttp/http_test.go +++ b/rafthttp/http_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/version" ) diff --git a/rafthttp/peer.go b/rafthttp/peer.go index 58b51f034..7cf64a024 100644 --- a/rafthttp/peer.go +++ b/rafthttp/peer.go @@ -20,10 +20,10 @@ import ( "time" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "golang.org/x/time/rate" ) diff --git a/rafthttp/snapshot_sender.go b/rafthttp/snapshot_sender.go index f8b47082d..342a79a1c 100644 --- a/rafthttp/snapshot_sender.go +++ b/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/httputil" pioutil "github.com/coreos/etcd/pkg/ioutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raftsnap" ) var ( diff --git a/rafthttp/snapshot_test.go b/rafthttp/snapshot_test.go index 7e8503c0a..ed8220fad 100644 --- a/rafthttp/snapshot_test.go +++ b/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" ) type strReaderCloser struct{ *strings.Reader } diff --git a/rafthttp/transport.go b/rafthttp/transport.go index c530694d7..6a127d972 100644 --- a/rafthttp/transport.go +++ b/rafthttp/transport.go @@ -21,12 +21,12 @@ import ( "time" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/pkg/capnslog" "github.com/xiang90/probing" diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index 89d3fea0f..045f95312 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -30,6 +30,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" @@ -38,7 +39,6 @@ import ( "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index c1a1e2bb8..e586d1bb4 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -22,10 +22,10 @@ import ( "time" "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" )