Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: revert "internal/lease" change

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-02-26 10:41:45 -08:00
parent bb95d190c1
commit dd2f3b0de8
36 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientv3/integration/maintenance_test.go
View File

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

2
etcdserver/api/etcdhttp/peer.go
View File

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

2
etcdserver/api/v3rpc/lease.go
View File

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

2
etcdserver/api/v3rpc/util.go
View File

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

2
etcdserver/apply.go
View File

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

2
etcdserver/apply_auth.go
View File

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

2
etcdserver/backend.go
View File

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

4
etcdserver/server.go
View File

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

2
etcdserver/server_test.go
View File

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

4
etcdserver/v3_server.go
View File

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

2
internal/mvcc/kv.go
View File

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

2
internal/mvcc/kv_test.go
View File

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

2
internal/mvcc/kv_view.go
View File

@ -14,7 +14,7 @@
package mvcc
import "github.com/coreos/etcd/internal/lease"
import "github.com/coreos/etcd/lease"
type readView struct{ kv KV }

3
internal/mvcc/kvstore.go
View File

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

2
internal/mvcc/kvstore_bench_test.go
View File

@ -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

2
internal/mvcc/kvstore_compaction_test.go
View File

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

2
internal/mvcc/kvstore_test.go
View File

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

2
internal/mvcc/kvstore_txn.go
View File

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

4
internal/mvcc/metrics_txn.go
View File

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

2
internal/mvcc/watchable_store.go
View File

@ -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

2
internal/mvcc/watchable_store_bench_test.go
View File

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

2
internal/mvcc/watchable_store_test.go
View File

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

2
internal/mvcc/watcher_bench_test.go
View File

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

2
internal/mvcc/watcher_test.go
View File

@ -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,

0
internal/lease/doc.go → lease/doc.go
View File

0
internal/lease/leasehttp/doc.go → lease/leasehttp/doc.go
View File

4
internal/lease/leasehttp/http.go → lease/leasehttp/http.go
View File

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

2
internal/lease/leasehttp/http_test.go → lease/leasehttp/http_test.go
View File

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

0
internal/lease/leasepb/lease.pb.go → lease/leasepb/lease.pb.go
View File

0
internal/lease/leasepb/lease.proto → lease/leasepb/lease.proto
View File

2
internal/lease/lessor.go → lease/lessor.go
View File

@ -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.

0
internal/lease/lessor_test.go → lease/lessor_test.go
View File

2
snapshot/v3_snapshot.go
View File

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

2
tools/benchmark/cmd/mvcc-put.go
View File

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

3
tools/benchmark/cmd/mvcc.go
View File

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

5
tools/etcd-dump-db/backend.go
View File

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