From a0b4ecbd4c68cf62827329772b0484662b3b615e Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 21 May 2018 01:23:04 -0700 Subject: [PATCH] rafthttp: use new "snap" import paths Signed-off-by: Gyuho Lee --- rafthttp/http.go | 6 +++--- rafthttp/http_test.go | 6 +++--- rafthttp/peer.go | 6 +++--- rafthttp/snapshot_sender.go | 6 +++--- rafthttp/snapshot_test.go | 8 ++++---- rafthttp/transport.go | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rafthttp/http.go b/rafthttp/http.go index 6ff9b67f7..6f49ca146 100644 --- a/rafthttp/http.go +++ b/rafthttp/http.go @@ -23,10 +23,10 @@ import ( "path" "strings" + "github.com/coreos/etcd/etcdserver/api/snap" 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" humanize "github.com/dustin/go-humanize" @@ -168,13 +168,13 @@ type snapshotHandler struct { lg *zap.Logger tr Transporter r Raft - snapshotter *raftsnap.Snapshotter + snapshotter *snap.Snapshotter localID types.ID cid types.ID } -func newSnapshotHandler(t *Transport, r Raft, snapshotter *raftsnap.Snapshotter, cid types.ID) http.Handler { +func newSnapshotHandler(t *Transport, r Raft, snapshotter *snap.Snapshotter, cid types.ID) http.Handler { return &snapshotHandler{ lg: t.Logger, tr: t, diff --git a/rafthttp/http_test.go b/rafthttp/http_test.go index 8ebd4b6cf..dc48fefef 100644 --- a/rafthttp/http_test.go +++ b/rafthttp/http_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" + "github.com/coreos/etcd/etcdserver/api/snap" "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" "go.uber.org/zap" @@ -358,7 +358,7 @@ func (pg *fakePeerGetter) Get(id types.ID) Peer { return pg.peers[id] } type fakePeer struct { msgs []raftpb.Message - snapMsgs []raftsnap.Message + snapMsgs []snap.Message peerURLs types.URLs connc chan *outgoingConn paused bool @@ -379,7 +379,7 @@ func (pr *fakePeer) send(m raftpb.Message) { pr.msgs = append(pr.msgs, m) } -func (pr *fakePeer) sendSnap(m raftsnap.Message) { +func (pr *fakePeer) sendSnap(m snap.Message) { if pr.paused { return } diff --git a/rafthttp/peer.go b/rafthttp/peer.go index ffaa2a7bc..404461b4e 100644 --- a/rafthttp/peer.go +++ b/rafthttp/peer.go @@ -19,11 +19,11 @@ import ( "sync" "time" + "github.com/coreos/etcd/etcdserver/api/snap" stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "go.uber.org/zap" "golang.org/x/time/rate" @@ -64,7 +64,7 @@ type Peer interface { // sendSnap sends the merged snapshot message to the remote peer. Its behavior // is similar to send. - sendSnap(m raftsnap.Message) + sendSnap(m snap.Message) // update updates the urls of remote peer. update(urls types.URLs) @@ -280,7 +280,7 @@ func (p *peer) send(m raftpb.Message) { } } -func (p *peer) sendSnap(m raftsnap.Message) { +func (p *peer) sendSnap(m snap.Message) { go p.snapSender.send(m) } diff --git a/rafthttp/snapshot_sender.go b/rafthttp/snapshot_sender.go index 1924c24b1..675de33e1 100644 --- a/rafthttp/snapshot_sender.go +++ b/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" + "github.com/coreos/etcd/etcdserver/api/snap" "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" "github.com/dustin/go-humanize" "go.uber.org/zap" @@ -66,7 +66,7 @@ func newSnapshotSender(tr *Transport, picker *urlPicker, to types.ID, status *pe func (s *snapshotSender) stop() { close(s.stopc) } -func (s *snapshotSender) send(merged raftsnap.Message) { +func (s *snapshotSender) send(merged snap.Message) { m := merged.Message body := createSnapBody(s.tr.Logger, merged) @@ -177,7 +177,7 @@ func (s *snapshotSender) post(req *http.Request) (err error) { } } -func createSnapBody(lg *zap.Logger, merged raftsnap.Message) io.ReadCloser { +func createSnapBody(lg *zap.Logger, merged snap.Message) io.ReadCloser { buf := new(bytes.Buffer) enc := &messageEncoder{w: buf} // encode raft message diff --git a/rafthttp/snapshot_test.go b/rafthttp/snapshot_test.go index 02b764702..ba3ce55eb 100644 --- a/rafthttp/snapshot_test.go +++ b/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "github.com/coreos/etcd/etcdserver/api/snap" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "go.uber.org/zap" ) @@ -84,7 +84,7 @@ func TestSnapshotSend(t *testing.T) { } for i, tt := range tests { - sent, files := testSnapshotSend(t, raftsnap.NewMessage(tt.m, tt.rc, tt.size)) + sent, files := testSnapshotSend(t, snap.NewMessage(tt.m, tt.rc, tt.size)) if tt.wsent != sent { t.Errorf("#%d: snapshot expected %v, got %v", i, tt.wsent, sent) } @@ -94,7 +94,7 @@ func TestSnapshotSend(t *testing.T) { } } -func testSnapshotSend(t *testing.T, sm *raftsnap.Message) (bool, []os.FileInfo) { +func testSnapshotSend(t *testing.T, sm *snap.Message) (bool, []os.FileInfo) { d, err := ioutil.TempDir(os.TempDir(), "snapdir") if err != nil { t.Fatal(err) @@ -104,7 +104,7 @@ func testSnapshotSend(t *testing.T, sm *raftsnap.Message) (bool, []os.FileInfo) r := &fakeRaft{} tr := &Transport{pipelineRt: &http.Transport{}, ClusterID: types.ID(1), Raft: r} ch := make(chan struct{}, 1) - h := &syncHandler{newSnapshotHandler(tr, r, raftsnap.New(zap.NewExample(), d), types.ID(1)), ch} + h := &syncHandler{newSnapshotHandler(tr, r, snap.New(zap.NewExample(), d), types.ID(1)), ch} srv := httptest.NewServer(h) defer srv.Close() diff --git a/rafthttp/transport.go b/rafthttp/transport.go index 9127625a8..d7aef130c 100644 --- a/rafthttp/transport.go +++ b/rafthttp/transport.go @@ -20,13 +20,13 @@ import ( "sync" "time" + "github.com/coreos/etcd/etcdserver/api/snap" stats "github.com/coreos/etcd/etcdserver/api/v2stats" "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" @@ -61,7 +61,7 @@ type Transporter interface { Send(m []raftpb.Message) // SendSnapshot sends out the given snapshot message to a remote peer. // The behavior of SendSnapshot is similar to Send. - SendSnapshot(m raftsnap.Message) + SendSnapshot(m snap.Message) // AddRemote adds a remote with given peer urls into the transport. // A remote helps newly joined member to catch up the progress of cluster, // and will not be used after that. @@ -112,7 +112,7 @@ type Transport struct { URLs types.URLs // local peer URLs ClusterID types.ID // raft cluster ID for request validation Raft Raft // raft state machine, to which the Transport forwards received messages and reports status - Snapshotter *raftsnap.Snapshotter + Snapshotter *snap.Snapshotter ServerStats *stats.ServerStats // used to record general transportation statistics // used to record transportation statistics with followers when // performing as leader in raft protocol @@ -412,7 +412,7 @@ func (t *Transport) ActiveSince(id types.ID) time.Time { return time.Time{} } -func (t *Transport) SendSnapshot(m raftsnap.Message) { +func (t *Transport) SendSnapshot(m snap.Message) { t.mu.Lock() defer t.mu.Unlock() p := t.peers[types.ID(m.To)]