From dd2f3b0de8c70d54c9e6eaa06329e3ad6bcb7260 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 26 Feb 2018 10:41:45 -0800 Subject: [PATCH] *: revert "internal/lease" change Signed-off-by: Gyuho Lee --- clientv3/integration/maintenance_test.go | 2 +- etcdserver/api/etcdhttp/peer.go | 2 +- etcdserver/api/v3rpc/lease.go | 2 +- etcdserver/api/v3rpc/util.go | 2 +- etcdserver/apply.go | 2 +- etcdserver/apply_auth.go | 2 +- etcdserver/backend.go | 2 +- etcdserver/server.go | 4 ++-- etcdserver/server_test.go | 2 +- etcdserver/v3_server.go | 4 ++-- internal/mvcc/kv.go | 2 +- internal/mvcc/kv_test.go | 2 +- internal/mvcc/kv_view.go | 2 +- internal/mvcc/kvstore.go | 3 ++- internal/mvcc/kvstore_bench_test.go | 2 +- internal/mvcc/kvstore_compaction_test.go | 2 +- internal/mvcc/kvstore_test.go | 2 +- internal/mvcc/kvstore_txn.go | 2 +- internal/mvcc/metrics_txn.go | 4 +--- internal/mvcc/watchable_store.go | 2 +- internal/mvcc/watchable_store_bench_test.go | 2 +- internal/mvcc/watchable_store_test.go | 2 +- internal/mvcc/watcher_bench_test.go | 2 +- internal/mvcc/watcher_test.go | 2 +- {internal/lease => lease}/doc.go | 0 {internal/lease => lease}/leasehttp/doc.go | 0 {internal/lease => lease}/leasehttp/http.go | 4 ++-- {internal/lease => lease}/leasehttp/http_test.go | 2 +- {internal/lease => lease}/leasepb/lease.pb.go | 0 {internal/lease => lease}/leasepb/lease.proto | 0 {internal/lease => lease}/lessor.go | 2 +- {internal/lease => lease}/lessor_test.go | 0 snapshot/v3_snapshot.go | 2 +- tools/benchmark/cmd/mvcc-put.go | 2 +- tools/benchmark/cmd/mvcc.go | 3 ++- tools/etcd-dump-db/backend.go | 5 +++-- 36 files changed, 38 insertions(+), 37 deletions(-) rename {internal/lease => lease}/doc.go (100%) rename {internal/lease => lease}/leasehttp/doc.go (100%) rename {internal/lease => lease}/leasehttp/http.go (98%) rename {internal/lease => lease}/leasehttp/http_test.go (98%) rename {internal/lease => lease}/leasepb/lease.pb.go (100%) rename {internal/lease => lease}/leasepb/lease.proto (100%) rename {internal/lease => lease}/lessor.go (99%) rename {internal/lease => lease}/lessor_test.go (100%) diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index 7db1938bc..87bc75f54 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -26,9 +26,9 @@ import ( "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go index ce376cbe6..0a9213b01 100644 --- a/etcdserver/api/etcdhttp/peer.go +++ b/etcdserver/api/etcdhttp/peer.go @@ -20,7 +20,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/internal/lease/leasehttp" + "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/rafthttp" ) diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index f872e860f..5b4f2b142 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -21,7 +21,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/internal/lease" + "github.com/coreos/etcd/lease" ) type LeaseServer struct { diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index bd092b3a1..e645918d2 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -22,8 +22,8 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" + "github.com/coreos/etcd/lease" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 791750d8e..9ca815e95 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -22,9 +22,9 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/types" "github.com/gogo/protobuf/proto" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index d95385af3..c46eaefd8 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -19,8 +19,8 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" + "github.com/coreos/etcd/lease" ) type authApplierV3 struct { diff --git a/etcdserver/backend.go b/etcdserver/backend.go index f6af4cbbe..0b72b0127 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,10 +19,10 @@ import ( "os" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/raftsnap" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/raft/raftpb" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 4bfcdfd49..0b3ea768d 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -38,12 +38,12 @@ 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/lease" - "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" + "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 3c51dcc51..897895194 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -28,11 +28,11 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/mock/mockstorage" diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index eeabb10eb..975383b66 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -23,9 +23,9 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/internal/lease" - "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/internal/mvcc" + "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/raft" "github.com/gogo/protobuf/proto" diff --git a/internal/mvcc/kv.go b/internal/mvcc/kv.go index e8cb1dec3..ae5f5fa66 100644 --- a/internal/mvcc/kv.go +++ b/internal/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" ) type RangeOptions struct { diff --git a/internal/mvcc/kv_test.go b/internal/mvcc/kv_test.go index e4185f47b..4a8295470 100644 --- a/internal/mvcc/kv_test.go +++ b/internal/mvcc/kv_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/testutil" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/mvcc/kv_view.go b/internal/mvcc/kv_view.go index 8269a7273..1e869c25b 100644 --- a/internal/mvcc/kv_view.go +++ b/internal/mvcc/kv_view.go @@ -14,7 +14,7 @@ package mvcc -import "github.com/coreos/etcd/internal/lease" +import "github.com/coreos/etcd/lease" type readView struct{ kv KV } diff --git a/internal/mvcc/kvstore.go b/internal/mvcc/kvstore.go index 1330b7b5c..6fd438205 100644 --- a/internal/mvcc/kvstore.go +++ b/internal/mvcc/kvstore.go @@ -24,10 +24,11 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/schedule" + "github.com/coreos/pkg/capnslog" ) diff --git a/internal/mvcc/kvstore_bench_test.go b/internal/mvcc/kvstore_bench_test.go index 0d4381a03..6551944b0 100644 --- a/internal/mvcc/kvstore_bench_test.go +++ b/internal/mvcc/kvstore_bench_test.go @@ -18,8 +18,8 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" ) type fakeConsistentIndex uint64 diff --git a/internal/mvcc/kvstore_compaction_test.go b/internal/mvcc/kvstore_compaction_test.go index 1dc9e08c3..e315602eb 100644 --- a/internal/mvcc/kvstore_compaction_test.go +++ b/internal/mvcc/kvstore_compaction_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" ) func TestScheduleCompaction(t *testing.T) { diff --git a/internal/mvcc/kvstore_test.go b/internal/mvcc/kvstore_test.go index a526b603a..df7216923 100644 --- a/internal/mvcc/kvstore_test.go +++ b/internal/mvcc/kvstore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/schedule" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/internal/mvcc/kvstore_txn.go b/internal/mvcc/kvstore_txn.go index 6d839a1a5..33939800b 100644 --- a/internal/mvcc/kvstore_txn.go +++ b/internal/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" ) type storeTxnRead struct { diff --git a/internal/mvcc/metrics_txn.go b/internal/mvcc/metrics_txn.go index 8f81f45e1..6a96be764 100644 --- a/internal/mvcc/metrics_txn.go +++ b/internal/mvcc/metrics_txn.go @@ -14,9 +14,7 @@ package mvcc -import ( - "github.com/coreos/etcd/internal/lease" -) +import "github.com/coreos/etcd/lease" type metricsTxnWrite struct { TxnWrite diff --git a/internal/mvcc/watchable_store.go b/internal/mvcc/watchable_store.go index 054be1034..d93fb6c9b 100644 --- a/internal/mvcc/watchable_store.go +++ b/internal/mvcc/watchable_store.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" ) // non-const so modifiable by tests diff --git a/internal/mvcc/watchable_store_bench_test.go b/internal/mvcc/watchable_store_bench_test.go index 65807ab42..5f7e39738 100644 --- a/internal/mvcc/watchable_store_bench_test.go +++ b/internal/mvcc/watchable_store_bench_test.go @@ -19,8 +19,8 @@ import ( "os" "testing" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" ) func BenchmarkWatchableStorePut(b *testing.B) { diff --git a/internal/mvcc/watchable_store_test.go b/internal/mvcc/watchable_store_test.go index 4f21aee45..00ea0c084 100644 --- a/internal/mvcc/watchable_store_test.go +++ b/internal/mvcc/watchable_store_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" ) func TestWatch(t *testing.T) { diff --git a/internal/mvcc/watcher_bench_test.go b/internal/mvcc/watcher_bench_test.go index 72264cb0c..99ff29f1b 100644 --- a/internal/mvcc/watcher_bench_test.go +++ b/internal/mvcc/watcher_bench_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" ) func BenchmarkKVWatcherMemoryUsage(b *testing.B) { diff --git a/internal/mvcc/watcher_test.go b/internal/mvcc/watcher_test.go index c4005b061..3a9c56303 100644 --- a/internal/mvcc/watcher_test.go +++ b/internal/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease" ) // TestWatcherWatchID tests that each watcher provides unique watchID, diff --git a/internal/lease/doc.go b/lease/doc.go similarity index 100% rename from internal/lease/doc.go rename to lease/doc.go diff --git a/internal/lease/leasehttp/doc.go b/lease/leasehttp/doc.go similarity index 100% rename from internal/lease/leasehttp/doc.go rename to lease/leasehttp/doc.go diff --git a/internal/lease/leasehttp/http.go b/lease/leasehttp/http.go similarity index 98% rename from internal/lease/leasehttp/http.go rename to lease/leasehttp/http.go index de561ab48..aa713f28e 100644 --- a/internal/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -24,8 +24,8 @@ import ( "time" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/internal/lease" - "github.com/coreos/etcd/internal/lease/leasepb" + "github.com/coreos/etcd/lease" + "github.com/coreos/etcd/lease/leasepb" "github.com/coreos/etcd/pkg/httputil" ) diff --git a/internal/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go similarity index 98% rename from internal/lease/leasehttp/http_test.go rename to lease/leasehttp/http_test.go index 29b603554..ba545b272 100644 --- a/internal/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" ) func TestRenewHTTP(t *testing.T) { diff --git a/internal/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go similarity index 100% rename from internal/lease/leasepb/lease.pb.go rename to lease/leasepb/lease.pb.go diff --git a/internal/lease/leasepb/lease.proto b/lease/leasepb/lease.proto similarity index 100% rename from internal/lease/leasepb/lease.proto rename to lease/leasepb/lease.proto diff --git a/internal/lease/lessor.go b/lease/lessor.go similarity index 99% rename from internal/lease/lessor.go rename to lease/lessor.go index cdb60be19..d3dda9bdc 100644 --- a/internal/lease/lessor.go +++ b/lease/lessor.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/internal/lease/leasepb" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease/leasepb" ) // NoLease is a special LeaseID representing the absence of a lease. diff --git a/internal/lease/lessor_test.go b/lease/lessor_test.go similarity index 100% rename from internal/lease/lessor_test.go rename to lease/lessor_test.go diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index efff0e273..2a6a0c5a2 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -30,11 +30,11 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/logger" "github.com/coreos/etcd/pkg/types" diff --git a/tools/benchmark/cmd/mvcc-put.go b/tools/benchmark/cmd/mvcc-put.go index ade9b3b47..2bf482d1b 100644 --- a/tools/benchmark/cmd/mvcc-put.go +++ b/tools/benchmark/cmd/mvcc-put.go @@ -21,7 +21,7 @@ import ( "runtime/pprof" "time" - "github.com/coreos/etcd/internal/lease" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/pkg/report" "github.com/spf13/cobra" diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 72b3f3754..fc666dc32 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -18,9 +18,10 @@ import ( "os" "time" - "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" + "github.com/coreos/etcd/lease" + "github.com/spf13/cobra" ) diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 986adf04d..e03caa6c9 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -19,11 +19,12 @@ import ( "fmt" "path/filepath" - bolt "github.com/coreos/bbolt" - "github.com/coreos/etcd/internal/lease/leasepb" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/mvcc/mvccpb" + "github.com/coreos/etcd/lease/leasepb" + + bolt "github.com/coreos/bbolt" ) func snapDir(dataDir string) string {