*: revert "internal/lease" change

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

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"
 )
 

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"
 )
 

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 {

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"

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"

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 {

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"
 )
 

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"

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"

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"

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 {

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"

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 }
 

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"
 )
 

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

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) {

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"
 )

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 {

internal/mvcc/metrics_txn.go

@@ -14,9 +14,7 @@
 
 package mvcc
 
-import (
+import "github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/internal/lease"
-)
 
 type metricsTxnWrite struct {
 	TxnWrite

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

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) {

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) {

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) {

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,

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/lease"
-	"github.com/coreos/etcd/internal/lease/leasepb"
+	"github.com/coreos/etcd/lease/leasepb"
 	"github.com/coreos/etcd/pkg/httputil"
 )
 

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) {

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.

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"

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"

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"
 )
 

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 {