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

etcdserver: update etcdserver to use the new raft module go.etcd.io/raft/v3 

Just replaced all go.etcd.io/etcd/raft/v3 with go.etcd.io/raft/v3
under directory server.

Signed-off-by: Benjamin Wang <wachao@vmware.com>
dependabot/go_modules/go.uber.org/atomic-1.10.0
Benjamin Wang 2022-12-02 09:33:45 +08:00
parent 571c65748e
commit e9aa275b36
62 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/etcdserver/api/etcdhttp/health.go
View File

@ -24,7 +24,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.uber.org/zap" "go.uber.org/zap"

2
server/etcdserver/api/etcdhttp/health_test.go
View File

@ -26,7 +26,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"

4
server/etcdserver/api/membership/cluster.go
View File

@ -30,8 +30,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/netutil" "go.etcd.io/etcd/pkg/v3/netutil"
"go.etcd.io/etcd/pkg/v3/notify" "go.etcd.io/etcd/pkg/v3/notify"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
serverversion "go.etcd.io/etcd/server/v3/etcdserver/version" serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"

2
server/etcdserver/api/membership/cluster_test.go
View File

@ -25,7 +25,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/mock/mockstore" "go.etcd.io/etcd/server/v3/mock/mockstore"
) )

2
server/etcdserver/api/rafthttp/coder.go
View File

@ -14,7 +14,7 @@
package rafthttp package rafthttp
import "go.etcd.io/etcd/raft/v3/raftpb" import "go.etcd.io/raft/v3/raftpb"
type encoder interface { type encoder interface {
// encode encodes the given message to an output stream. // encode encodes the given message to an output stream.

4
server/etcdserver/api/rafthttp/functional_test.go
View File

@ -22,8 +22,8 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/rafthttp/http.go
View File

@ -27,7 +27,7 @@ import (
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
pioutil "go.etcd.io/etcd/pkg/v3/ioutil" pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
humanize "github.com/dustin/go-humanize" humanize "github.com/dustin/go-humanize"

2
server/etcdserver/api/rafthttp/http_test.go
View File

@ -29,7 +29,7 @@ import (
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/rafthttp/msg_codec.go
View File

@ -20,7 +20,7 @@ import (
"io" "io"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
// messageEncoder is a encoder that can encode all kinds of messages. // messageEncoder is a encoder that can encode all kinds of messages.

2
server/etcdserver/api/rafthttp/msg_codec_test.go
View File

@ -19,7 +19,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
func TestMessage(t *testing.T) { func TestMessage(t *testing.T) {

2
server/etcdserver/api/rafthttp/msgappv2_codec.go
View File

@ -22,7 +22,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
) )

2
server/etcdserver/api/rafthttp/msgappv2_codec_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
) )

4
server/etcdserver/api/rafthttp/peer.go
View File

@ -20,8 +20,8 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"

2
server/etcdserver/api/rafthttp/peer_test.go
View File

@ -17,7 +17,7 @@ package rafthttp
import ( import (
"testing" "testing"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
func TestPeerPick(t *testing.T) { func TestPeerPick(t *testing.T) {

4
server/etcdserver/api/rafthttp/pipeline.go
View File

@ -25,8 +25,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap" "go.uber.org/zap"

2
server/etcdserver/api/rafthttp/pipeline_test.go
View File

@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/rafthttp/remote.go
View File

@ -16,7 +16,7 @@ package rafthttp
import ( import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/etcdserver/api/rafthttp/snapshot_sender.go
View File

@ -24,7 +24,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/httputil" "go.etcd.io/etcd/pkg/v3/httputil"
pioutil "go.etcd.io/etcd/pkg/v3/ioutil" pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"

2
server/etcdserver/api/rafthttp/snapshot_test.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/rafthttp/stream.go
View File

@ -28,7 +28,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/httputil" "go.etcd.io/etcd/pkg/v3/httputil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"

2
server/etcdserver/api/rafthttp/stream_test.go
View File

@ -28,7 +28,7 @@ import (
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"

4
server/etcdserver/api/rafthttp/transport.go
View File

@ -22,8 +22,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"

4
server/etcdserver/api/rafthttp/transport_bench_test.go
View File

@ -22,8 +22,8 @@ import (
"time" "time"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/rafthttp/transport_test.go
View File

@ -22,7 +22,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"

2
server/etcdserver/api/rafthttp/util_test.go
View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
) )

2
server/etcdserver/api/snap/message.go
View File

@ -18,7 +18,7 @@ import (
"io" "io"
"go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/ioutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
// Message is a struct that contains a raft Message and a ReadCloser. The type // Message is a struct that contains a raft Message and a ReadCloser. The type

4
server/etcdserver/api/snap/snapshotter.go
View File

@ -28,8 +28,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/verify" "go.etcd.io/etcd/client/pkg/v3/verify"
pioutil "go.etcd.io/etcd/pkg/v3/ioutil" pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap/snappb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap/snappb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"

2
server/etcdserver/api/snap/snapshotter_test.go
View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/api/v2stats/server.go
View File

@ -20,7 +20,7 @@ import (
"sync" "sync"
"time" "time"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
) )
// ServerStats encapsulates various statistics about an EtcdServer and its // ServerStats encapsulates various statistics about an EtcdServer and its

2
server/etcdserver/api/v3rpc/interceptor.go
View File

@ -22,7 +22,7 @@ import (
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api"

2
server/etcdserver/api/v3rpc/maintenance.go
View File

@ -24,7 +24,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/apply" "go.etcd.io/etcd/server/v3/etcdserver/apply"
"go.etcd.io/etcd/server/v3/etcdserver/errors" "go.etcd.io/etcd/server/v3/etcdserver/errors"

4
server/etcdserver/bootstrap.go
View File

@ -32,8 +32,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"

2
server/etcdserver/bootstrap_test.go
View File

@ -37,7 +37,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"

4
server/etcdserver/raft.go
View File

@ -23,8 +23,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/client/pkg/v3/logutil"
"go.etcd.io/etcd/pkg/v3/contention" "go.etcd.io/etcd/pkg/v3/contention"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
serverstorage "go.etcd.io/etcd/server/v3/storage" serverstorage "go.etcd.io/etcd/server/v3/storage"
"go.uber.org/zap" "go.uber.org/zap"

4
server/etcdserver/raft_test.go
View File

@ -24,8 +24,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/mock/mockstorage" "go.etcd.io/etcd/server/v3/mock/mockstorage"
serverstorage "go.etcd.io/etcd/server/v3/storage" serverstorage "go.etcd.io/etcd/server/v3/storage"

4
server/etcdserver/server.go
View File

@ -50,8 +50,8 @@ import (
"go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/schedule"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/pkg/v3/wait" "go.etcd.io/etcd/pkg/v3/wait"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api"
httptypes "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types" httptypes "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types"

4
server/etcdserver/server_test.go
View File

@ -38,8 +38,8 @@ import (
"go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/etcd/pkg/v3/idutil"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/pkg/v3/wait" "go.etcd.io/etcd/pkg/v3/wait"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"

2
server/etcdserver/snapshot_merge.go
View File

@ -17,7 +17,7 @@ package etcdserver
import ( import (
"io" "io"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"

2
server/etcdserver/txn/util_bench_test.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/util_test.go
View File

@ -22,7 +22,7 @@ import (
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"

2
server/etcdserver/v3_server.go
View File

@ -25,7 +25,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
apply2 "go.etcd.io/etcd/server/v3/etcdserver/apply" apply2 "go.etcd.io/etcd/server/v3/etcdserver/apply"

2
server/etcdserver/zap_raft.go
View File

@ -17,7 +17,7 @@ package etcdserver
import ( import (
"errors" "errors"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"

4
server/go.mod
View File

@ -28,7 +28,7 @@ require (
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0 go.etcd.io/etcd/client/v2 v2.306.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0 go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0 go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0 go.etcd.io/raft/v3 v3.6.0-alpha.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0
go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
@ -81,7 +81,7 @@ replace (
go.etcd.io/etcd/client/v2 => ../client/v2 go.etcd.io/etcd/client/v2 => ../client/v2
go.etcd.io/etcd/client/v3 => ../client/v3 go.etcd.io/etcd/client/v3 => ../client/v3
go.etcd.io/etcd/pkg/v3 => ../pkg go.etcd.io/etcd/pkg/v3 => ../pkg
go.etcd.io/etcd/raft/v3 => ../raft go.etcd.io/raft/v3 => ../raft
) )
// Bad imports are sometimes causing attempts to pull that code. // Bad imports are sometimes causing attempts to pull that code.

4
server/mock/mockstorage/storage_recorder.go
View File

@ -17,8 +17,8 @@ package mockstorage
import ( import (
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
type storageRecorder struct { type storageRecorder struct {

2
server/storage/backend.go
View File

@ -19,7 +19,7 @@ import (
"os" "os"
"time" "time"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"

2
server/storage/hooks.go
View File

@ -19,10 +19,10 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/etcdserver/cindex"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/server/v3/storage/schema"
"go.etcd.io/raft/v3/raftpb"
) )
type BackendHooks struct { type BackendHooks struct {

2
server/storage/schema/confstate.go
View File

@ -18,7 +18,7 @@ import (
"encoding/json" "encoding/json"
"log" "log"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/storage/schema/confstate_test.go
View File

@ -18,7 +18,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/storage/schema/schema_test.go
View File

@ -23,7 +23,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/api/v3/membershippb"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal"

2
server/storage/storage.go
View File

@ -18,7 +18,7 @@ import (
"sync" "sync"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/snap"
"go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"

2
server/storage/util.go
View File

@ -23,7 +23,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store"

2
server/storage/wal/decoder.go
View File

@ -24,7 +24,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/crc"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
) )

2
server/storage/wal/repair_test.go
View File

@ -20,7 +20,7 @@ import (
"os" "os"
"testing" "testing"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/storage/wal/testing/waltesting.go
View File

@ -21,7 +21,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"

2
server/storage/wal/version.go
View File

@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
// ReadWALVersion reads remaining entries from opened WAL and returns struct // ReadWALVersion reads remaining entries from opened WAL and returns struct

2
server/storage/wal/version_test.go
View File

@ -25,7 +25,7 @@ import (
"go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/api/v3/membershippb"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoreflect"
) )

4
server/storage/wal/wal.go
View File

@ -28,8 +28,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/raft/v3"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.uber.org/zap" "go.uber.org/zap"

2
server/storage/wal/wal_bench_test.go
View File

@ -17,7 +17,7 @@ package wal
import ( import (
"testing" "testing"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/storage/wal/wal_test.go
View File

@ -32,7 +32,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/storage/wal/walpb/record.pb.go
View File

@ -11,7 +11,7 @@ import (
_ "github.com/gogo/protobuf/gogoproto" _ "github.com/gogo/protobuf/gogoproto"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
raftpb "go.etcd.io/etcd/raft/v3/raftpb" raftpb "go.etcd.io/raft/v3/raftpb"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

2
server/storage/wal/walpb/record_test.go
View File

@ -18,7 +18,7 @@ import (
"testing" "testing"
"github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/descriptor"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
) )
func TestSnapshotMetadataCompatibility(t *testing.T) { func TestSnapshotMetadataCompatibility(t *testing.T) {

2
server/verify/verify.go
View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"go.etcd.io/etcd/client/pkg/v3/verify" "go.etcd.io/etcd/client/pkg/v3/verify"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/datadir"
"go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/server/v3/storage/schema"