|
@@ -29,18 +29,18 @@ import (
|
|
|
"sync"
|
|
"sync"
|
|
|
"time"
|
|
"time"
|
|
|
|
|
|
|
|
- "github.com/coreos/etcd/etcdserver"
|
|
|
|
|
- "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/v2v3"
|
|
|
|
|
- "github.com/coreos/etcd/etcdserver/api/v3client"
|
|
|
|
|
- "github.com/coreos/etcd/etcdserver/api/v3rpc"
|
|
|
|
|
- "github.com/coreos/etcd/pkg/debugutil"
|
|
|
|
|
- runtimeutil "github.com/coreos/etcd/pkg/runtime"
|
|
|
|
|
- "github.com/coreos/etcd/pkg/transport"
|
|
|
|
|
- "github.com/coreos/etcd/pkg/types"
|
|
|
|
|
- "github.com/coreos/etcd/version"
|
|
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/etcdhttp"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/rafthttp"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/v2http"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/v2v3"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/v3client"
|
|
|
|
|
+ "go.etcd.io/etcd/etcdserver/api/v3rpc"
|
|
|
|
|
+ "go.etcd.io/etcd/pkg/debugutil"
|
|
|
|
|
+ runtimeutil "go.etcd.io/etcd/pkg/runtime"
|
|
|
|
|
+ "go.etcd.io/etcd/pkg/transport"
|
|
|
|
|
+ "go.etcd.io/etcd/pkg/types"
|
|
|
|
|
+ "go.etcd.io/etcd/version"
|
|
|
|
|
|
|
|
"github.com/coreos/pkg/capnslog"
|
|
"github.com/coreos/pkg/capnslog"
|
|
|
"github.com/grpc-ecosystem/go-grpc-prometheus"
|
|
"github.com/grpc-ecosystem/go-grpc-prometheus"
|
|
@@ -50,7 +50,7 @@ import (
|
|
|
"google.golang.org/grpc/keepalive"
|
|
"google.golang.org/grpc/keepalive"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
-var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed")
|
|
|
|
|
|
|
+var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed")
|
|
|
|
|
|
|
|
const (
|
|
const (
|
|
|
// internal fd usage includes disk usage and transport usage.
|
|
// internal fd usage includes disk usage and transport usage.
|
|
@@ -412,7 +412,7 @@ func stopServers(ctx context.Context, ss *servers) {
|
|
|
|
|
|
|
|
// do not grpc.Server.GracefulStop with TLS enabled etcd server
|
|
// do not grpc.Server.GracefulStop with TLS enabled etcd server
|
|
|
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
|
|
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
|
|
|
- // and https://github.com/coreos/etcd/issues/8916
|
|
|
|
|
|
|
+ // and https://go.etcd.io/etcd/issues/8916
|
|
|
if ss.secure {
|
|
if ss.secure {
|
|
|
shutdownNow()
|
|
shutdownNow()
|
|
|
return
|
|
return
|