Home Explore Help
Register Sign In
publics
/
etcd-io__etcd
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

*: move internal "etcdserver/api/rafthttp"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
2dd555c983
commit
7940113906
39 changed files with 10 additions and 10 deletions
Unified View Show Diff Stats
  1. 1 1
      contrib/raftexample/raft.go
  2. 1 1
      embed/etcd.go
  3. 1 1
      etcdserver/api/etcdhttp/peer.go
  4. 1 1
      etcdserver/api/etcdhttp/peer_test.go
  5. 0 0
      etcdserver/api/rafthttp/coder.go
  6. 0 0
      etcdserver/api/rafthttp/doc.go
  7. 0 0
      etcdserver/api/rafthttp/fake_roundtripper_test.go
  8. 0 0
      etcdserver/api/rafthttp/functional_test.go
  9. 0 0
      etcdserver/api/rafthttp/http.go
  10. 0 0
      etcdserver/api/rafthttp/http_test.go
  11. 0 0
      etcdserver/api/rafthttp/metrics.go
  12. 0 0
      etcdserver/api/rafthttp/msg_codec.go
  13. 0 0
      etcdserver/api/rafthttp/msg_codec_test.go
  14. 0 0
      etcdserver/api/rafthttp/msgappv2_codec.go
  15. 0 0
      etcdserver/api/rafthttp/msgappv2_codec_test.go
  16. 0 0
      etcdserver/api/rafthttp/peer.go
  17. 0 0
      etcdserver/api/rafthttp/peer_status.go
  18. 0 0
      etcdserver/api/rafthttp/peer_test.go
  19. 0 0
      etcdserver/api/rafthttp/pipeline.go
  20. 0 0
      etcdserver/api/rafthttp/pipeline_test.go
  21. 0 0
      etcdserver/api/rafthttp/probing_status.go
  22. 0 0
      etcdserver/api/rafthttp/remote.go
  23. 0 0
      etcdserver/api/rafthttp/snapshot_sender.go
  24. 0 0
      etcdserver/api/rafthttp/snapshot_test.go
  25. 0 0
      etcdserver/api/rafthttp/stream.go
  26. 0 0
      etcdserver/api/rafthttp/stream_test.go
  27. 0 0
      etcdserver/api/rafthttp/transport.go
  28. 0 0
      etcdserver/api/rafthttp/transport_bench_test.go
  29. 0 0
      etcdserver/api/rafthttp/transport_test.go
  30. 0 0
      etcdserver/api/rafthttp/urlpick.go
  31. 0 0
      etcdserver/api/rafthttp/urlpick_test.go
  32. 0 0
      etcdserver/api/rafthttp/util.go
  33. 0 0
      etcdserver/api/rafthttp/util_test.go
  34. 1 1
      etcdserver/raft.go
  35. 1 1
      etcdserver/server.go
  36. 1 1
      etcdserver/server_test.go
  37. 1 1
      etcdserver/util.go
  38. 1 1
      etcdserver/util_test.go
  39. 1 1
      integration/cluster.go

+ 1 - 1
contrib/raftexample/raft.go
View File 

@@ -24,13 +24,13 @@ import (
 
 	"strconv"
 
 	"strconv"
 
 	"time"
 
 	"time"
 
 
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	stats "github.com/coreos/etcd/etcdserver/api/v2stats"
 
 	stats "github.com/coreos/etcd/etcdserver/api/v2stats"
 
 	"github.com/coreos/etcd/pkg/fileutil"
 
 	"github.com/coreos/etcd/pkg/fileutil"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
-	"github.com/coreos/etcd/rafthttp"
 
 	"github.com/coreos/etcd/wal"
 
 	"github.com/coreos/etcd/wal"
 
 	"github.com/coreos/etcd/wal/walpb"
 
 	"github.com/coreos/etcd/wal/walpb"

+ 1 - 1
embed/etcd.go
View File 

@@ -30,6 +30,7 @@ import (
 
 
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
 
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http"
 
 	"github.com/coreos/etcd/etcdserver/api/v2v3"
 
 	"github.com/coreos/etcd/etcdserver/api/v2v3"
 
 	"github.com/coreos/etcd/etcdserver/api/v3client"
 
 	"github.com/coreos/etcd/etcdserver/api/v3client"
 
@@ -38,7 +39,6 @@ import (
 
 	runtimeutil "github.com/coreos/etcd/pkg/runtime"
 
 	runtimeutil "github.com/coreos/etcd/pkg/runtime"
 
 	"github.com/coreos/etcd/pkg/transport"
 
 	"github.com/coreos/etcd/pkg/transport"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
-	"github.com/coreos/etcd/rafthttp"
 
 
 
 	"github.com/coreos/pkg/capnslog"
 
 	"github.com/coreos/pkg/capnslog"
 
 	"github.com/grpc-ecosystem/go-grpc-prometheus"
 
 	"github.com/grpc-ecosystem/go-grpc-prometheus"

+ 1 - 1
etcdserver/api/etcdhttp/peer.go
View File 

@@ -20,8 +20,8 @@ import (
 
 
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver/api"
 
 	"github.com/coreos/etcd/etcdserver/api"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/lease/leasehttp"
 
 	"github.com/coreos/etcd/lease/leasehttp"
 
-	"github.com/coreos/etcd/rafthttp"
 
 
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"
 
 )
 
 )

+ 1 - 1
etcdserver/api/etcdhttp/peer_test.go
View File 

@@ -26,9 +26,9 @@ import (
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"
 
 
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/pkg/testutil"
 
 	"github.com/coreos/etcd/pkg/testutil"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
-	"github.com/coreos/etcd/rafthttp"
 
 	"github.com/coreos/go-semver/semver"
 
 	"github.com/coreos/go-semver/semver"
 
 )
 
 )

+ 0 - 0
rafthttp/coder.go → etcdserver/api/rafthttp/coder.go
View File


+ 0 - 0
rafthttp/doc.go → etcdserver/api/rafthttp/doc.go
View File


+ 0 - 0
rafthttp/fake_roundtripper_test.go → etcdserver/api/rafthttp/fake_roundtripper_test.go
View File


+ 0 - 0
rafthttp/functional_test.go → etcdserver/api/rafthttp/functional_test.go
View File


+ 0 - 0
rafthttp/http.go → etcdserver/api/rafthttp/http.go
View File


+ 0 - 0
rafthttp/http_test.go → etcdserver/api/rafthttp/http_test.go
View File


+ 0 - 0
rafthttp/metrics.go → etcdserver/api/rafthttp/metrics.go
View File


+ 0 - 0
rafthttp/msg_codec.go → etcdserver/api/rafthttp/msg_codec.go
View File


+ 0 - 0
rafthttp/msg_codec_test.go → etcdserver/api/rafthttp/msg_codec_test.go
View File


+ 0 - 0
rafthttp/msgappv2_codec.go → etcdserver/api/rafthttp/msgappv2_codec.go
View File


+ 0 - 0
rafthttp/msgappv2_codec_test.go → etcdserver/api/rafthttp/msgappv2_codec_test.go
View File


+ 0 - 0
rafthttp/peer.go → etcdserver/api/rafthttp/peer.go
View File


+ 0 - 0
rafthttp/peer_status.go → etcdserver/api/rafthttp/peer_status.go
View File


+ 0 - 0
rafthttp/peer_test.go → etcdserver/api/rafthttp/peer_test.go
View File


+ 0 - 0
rafthttp/pipeline.go → etcdserver/api/rafthttp/pipeline.go
View File


+ 0 - 0
rafthttp/pipeline_test.go → etcdserver/api/rafthttp/pipeline_test.go
View File


+ 0 - 0
rafthttp/probing_status.go → etcdserver/api/rafthttp/probing_status.go
View File


+ 0 - 0
rafthttp/remote.go → etcdserver/api/rafthttp/remote.go
View File


+ 0 - 0
rafthttp/snapshot_sender.go → etcdserver/api/rafthttp/snapshot_sender.go
View File


+ 0 - 0
rafthttp/snapshot_test.go → etcdserver/api/rafthttp/snapshot_test.go
View File


+ 0 - 0
rafthttp/stream.go → etcdserver/api/rafthttp/stream.go
View File


+ 0 - 0
rafthttp/stream_test.go → etcdserver/api/rafthttp/stream_test.go
View File


+ 0 - 0
rafthttp/transport.go → etcdserver/api/rafthttp/transport.go
View File


+ 0 - 0
rafthttp/transport_bench_test.go → etcdserver/api/rafthttp/transport_bench_test.go
View File


+ 0 - 0
rafthttp/transport_test.go → etcdserver/api/rafthttp/transport_test.go
View File


+ 0 - 0
rafthttp/urlpick.go → etcdserver/api/rafthttp/urlpick.go
View File


+ 0 - 0
rafthttp/urlpick_test.go → etcdserver/api/rafthttp/urlpick_test.go
View File


+ 0 - 0
rafthttp/util.go → etcdserver/api/rafthttp/util.go
View File


+ 0 - 0
rafthttp/util_test.go → etcdserver/api/rafthttp/util_test.go
View File


+ 1 - 1
etcdserver/raft.go
View File 

@@ -23,6 +23,7 @@ import (
 
 	"time"
 
 	"time"
 
 
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 
 	"github.com/coreos/etcd/pkg/contention"
 
 	"github.com/coreos/etcd/pkg/contention"
 
 	"github.com/coreos/etcd/pkg/logutil"
 
 	"github.com/coreos/etcd/pkg/logutil"
 
@@ -30,7 +31,6 @@ import (
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
-	"github.com/coreos/etcd/rafthttp"
 
 	"github.com/coreos/etcd/wal"
 
 	"github.com/coreos/etcd/wal"
 
 	"github.com/coreos/etcd/wal/walpb"
 
 	"github.com/coreos/etcd/wal/walpb"

+ 1 - 1
etcdserver/server.go
View File 

@@ -32,6 +32,7 @@ import (
 
 	"github.com/coreos/etcd/auth"
 
 	"github.com/coreos/etcd/auth"
 
 	"github.com/coreos/etcd/etcdserver/api"
 
 	"github.com/coreos/etcd/etcdserver/api"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/v2discovery"
 
 	"github.com/coreos/etcd/etcdserver/api/v2discovery"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 
@@ -53,7 +54,6 @@ import (
 
 	"github.com/coreos/etcd/pkg/wait"
 
 	"github.com/coreos/etcd/pkg/wait"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
-	"github.com/coreos/etcd/rafthttp"
 
 	"github.com/coreos/etcd/version"
 
 	"github.com/coreos/etcd/version"
 
 	"github.com/coreos/etcd/wal"
 
 	"github.com/coreos/etcd/wal"

+ 1 - 1
etcdserver/server_test.go
View File 

@@ -31,6 +31,7 @@ import (
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"
 
 
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/v2store"
 
 	"github.com/coreos/etcd/etcdserver/api/v2store"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 
@@ -48,7 +49,6 @@ import (
 
 	"github.com/coreos/etcd/pkg/wait"
 
 	"github.com/coreos/etcd/pkg/wait"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
-	"github.com/coreos/etcd/rafthttp"
 
 )
 
 )
 
 
 
 // TestDoLocalAction tests requests which do not need to go through raft to be applied,
 
 // TestDoLocalAction tests requests which do not need to go through raft to be applied,

+ 1 - 1
etcdserver/util.go
View File 

@@ -19,8 +19,8 @@ import (
 
 	"time"
 
 	"time"
 
 
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
-	"github.com/coreos/etcd/rafthttp"
 
 
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"
 
 )
 
 )

+ 1 - 1
etcdserver/util_test.go
View File 

@@ -22,10 +22,10 @@ import (
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"
 
 
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
 	"github.com/coreos/etcd/etcdserver/api/membership"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/etcdserver/api/snap"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
 	"github.com/coreos/etcd/raft/raftpb"
 
-	"github.com/coreos/etcd/rafthttp"
 
 )
 
 )
 
 
 
 func TestLongestConnected(t *testing.T) {
 
 func TestLongestConnected(t *testing.T) {

+ 1 - 1
integration/cluster.go
View File 

@@ -38,6 +38,7 @@ import (
 
 	"github.com/coreos/etcd/embed"
 
 	"github.com/coreos/etcd/embed"
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver"
 
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
 
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
 
+	"github.com/coreos/etcd/etcdserver/api/rafthttp"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http"
 
 	"github.com/coreos/etcd/etcdserver/api/v2http"
 
 	"github.com/coreos/etcd/etcdserver/api/v3client"
 
 	"github.com/coreos/etcd/etcdserver/api/v3client"
 
 	"github.com/coreos/etcd/etcdserver/api/v3election"
 
 	"github.com/coreos/etcd/etcdserver/api/v3election"
 
@@ -50,7 +51,6 @@ import (
 
 	"github.com/coreos/etcd/pkg/tlsutil"
 
 	"github.com/coreos/etcd/pkg/tlsutil"
 
 	"github.com/coreos/etcd/pkg/transport"
 
 	"github.com/coreos/etcd/pkg/transport"
 
 	"github.com/coreos/etcd/pkg/types"
 
 	"github.com/coreos/etcd/pkg/types"
 
-	"github.com/coreos/etcd/rafthttp"
 
 
 
 	"github.com/soheilhy/cmux"
 
 	"github.com/soheilhy/cmux"
 
 	"go.uber.org/zap"
 
 	"go.uber.org/zap"