[VOL-4291] Rw-core updates for gRPC migration
Change-Id: I8d5a554409115b29318089671ca4e1ab3fa98810
diff --git a/vendor/go.etcd.io/etcd/embed/etcd.go b/vendor/go.etcd.io/etcd/embed/etcd.go
index ac7dbc9..d656e17 100644
--- a/vendor/go.etcd.io/etcd/embed/etcd.go
+++ b/vendor/go.etcd.io/etcd/embed/etcd.go
@@ -23,34 +23,32 @@
"net"
"net/http"
"net/url"
- "runtime"
- "sort"
"strconv"
"sync"
"time"
- "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/etcd/compactor"
+ "github.com/coreos/etcd/etcdserver"
+ "github.com/coreos/etcd/etcdserver/api/etcdhttp"
+ "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/cors"
+ "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/rafthttp"
"github.com/coreos/pkg/capnslog"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/soheilhy/cmux"
- "go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/keepalive"
)
-var plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "embed")
+var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "embed")
const (
// internal fd usage includes disk usage and transport usage.
@@ -113,26 +111,12 @@
e = nil
}()
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "configuring peer listeners",
- zap.Strings("listen-peer-urls", e.cfg.getLPURLs()),
- )
- }
- if e.Peers, err = configurePeerListeners(cfg); err != nil {
+ if e.Peers, err = startPeerListeners(cfg); err != nil {
return e, err
}
-
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "configuring client listeners",
- zap.Strings("listen-client-urls", e.cfg.getLCURLs()),
- )
- }
- if e.sctxs, err = configureClientListeners(cfg); err != nil {
+ if e.sctxs, err = startClientListeners(cfg); err != nil {
return e, err
}
-
for _, sctx := range e.sctxs {
e.Clients = append(e.Clients, sctx.l)
}
@@ -141,6 +125,7 @@
urlsmap types.URLsMap
token string
)
+
memberInitialized := true
if !isMemberInitialized(cfg) {
memberInitialized = false
@@ -159,16 +144,13 @@
return e, err
}
- backendFreelistType := parseBackendFreelistType(cfg.ExperimentalBackendFreelistType)
-
srvcfg := etcdserver.ServerConfig{
Name: cfg.Name,
ClientURLs: cfg.ACUrls,
PeerURLs: cfg.APUrls,
DataDir: cfg.Dir,
DedicatedWALDir: cfg.WalDir,
- SnapshotCount: cfg.SnapshotCount,
- SnapshotCatchUpEntries: cfg.SnapshotCatchUpEntries,
+ SnapCount: cfg.SnapCount,
MaxSnapFiles: cfg.MaxSnapFiles,
MaxWALFiles: cfg.MaxWalFiles,
InitialPeerURLsMap: urlsmap,
@@ -176,6 +158,7 @@
DiscoveryURL: cfg.Durl,
DiscoveryProxy: cfg.Dproxy,
NewCluster: cfg.IsNewCluster(),
+ ForceNewCluster: cfg.ForceNewCluster,
PeerTLSInfo: cfg.PeerTLSInfo,
TickMs: cfg.TickMs,
ElectionTicks: cfg.ElectionTicks(),
@@ -183,31 +166,17 @@
AutoCompactionRetention: autoCompactionRetention,
AutoCompactionMode: cfg.AutoCompactionMode,
QuotaBackendBytes: cfg.QuotaBackendBytes,
- BackendBatchLimit: cfg.BackendBatchLimit,
- BackendFreelistType: backendFreelistType,
- BackendBatchInterval: cfg.BackendBatchInterval,
MaxTxnOps: cfg.MaxTxnOps,
MaxRequestBytes: cfg.MaxRequestBytes,
StrictReconfigCheck: cfg.StrictReconfigCheck,
ClientCertAuthEnabled: cfg.ClientTLSInfo.ClientCertAuth,
AuthToken: cfg.AuthToken,
- BcryptCost: cfg.BcryptCost,
- CORS: cfg.CORS,
- HostWhitelist: cfg.HostWhitelist,
+ TokenTTL: cfg.AuthTokenTTL,
InitialCorruptCheck: cfg.ExperimentalInitialCorruptCheck,
CorruptCheckTime: cfg.ExperimentalCorruptCheckTime,
- PreVote: cfg.PreVote,
- Logger: cfg.logger,
- LoggerConfig: cfg.loggerConfig,
- LoggerCore: cfg.loggerCore,
- LoggerWriteSyncer: cfg.loggerWriteSyncer,
Debug: cfg.Debug,
- ForceNewCluster: cfg.ForceNewCluster,
- EnableGRPCGateway: cfg.EnableGRPCGateway,
- EnableLeaseCheckpoint: cfg.ExperimentalEnableLeaseCheckpoint,
- CompactionBatchLimit: cfg.ExperimentalCompactionBatchLimit,
}
- print(e.cfg.logger, *cfg, srvcfg, memberInitialized)
+
if e.Server, err = etcdserver.NewServer(srvcfg); err != nil {
return e, err
}
@@ -237,109 +206,10 @@
return e, err
}
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "now serving peer/client/metrics",
- zap.String("local-member-id", e.Server.ID().String()),
- zap.Strings("initial-advertise-peer-urls", e.cfg.getAPURLs()),
- zap.Strings("listen-peer-urls", e.cfg.getLPURLs()),
- zap.Strings("advertise-client-urls", e.cfg.getACURLs()),
- zap.Strings("listen-client-urls", e.cfg.getLCURLs()),
- zap.Strings("listen-metrics-urls", e.cfg.getMetricsURLs()),
- )
- }
serving = true
return e, nil
}
-func print(lg *zap.Logger, ec Config, sc etcdserver.ServerConfig, memberInitialized bool) {
- // TODO: remove this after dropping "capnslog"
- if lg == nil {
- plog.Infof("name = %s", ec.Name)
- if sc.ForceNewCluster {
- plog.Infof("force new cluster")
- }
- plog.Infof("data dir = %s", sc.DataDir)
- plog.Infof("member dir = %s", sc.MemberDir())
- if sc.DedicatedWALDir != "" {
- plog.Infof("dedicated WAL dir = %s", sc.DedicatedWALDir)
- }
- plog.Infof("heartbeat = %dms", sc.TickMs)
- plog.Infof("election = %dms", sc.ElectionTicks*int(sc.TickMs))
- plog.Infof("snapshot count = %d", sc.SnapshotCount)
- if len(sc.DiscoveryURL) != 0 {
- plog.Infof("discovery URL= %s", sc.DiscoveryURL)
- if len(sc.DiscoveryProxy) != 0 {
- plog.Infof("discovery proxy = %s", sc.DiscoveryProxy)
- }
- }
- plog.Infof("advertise client URLs = %s", sc.ClientURLs)
- if memberInitialized {
- plog.Infof("initial advertise peer URLs = %s", sc.PeerURLs)
- plog.Infof("initial cluster = %s", sc.InitialPeerURLsMap)
- }
- } else {
- cors := make([]string, 0, len(ec.CORS))
- for v := range ec.CORS {
- cors = append(cors, v)
- }
- sort.Strings(cors)
-
- hss := make([]string, 0, len(ec.HostWhitelist))
- for v := range ec.HostWhitelist {
- hss = append(hss, v)
- }
- sort.Strings(hss)
-
- quota := ec.QuotaBackendBytes
- if quota == 0 {
- quota = etcdserver.DefaultQuotaBytes
- }
-
- lg.Info(
- "starting an etcd server",
- zap.String("etcd-version", version.Version),
- zap.String("git-sha", version.GitSHA),
- zap.String("go-version", runtime.Version()),
- zap.String("go-os", runtime.GOOS),
- zap.String("go-arch", runtime.GOARCH),
- zap.Int("max-cpu-set", runtime.GOMAXPROCS(0)),
- zap.Int("max-cpu-available", runtime.NumCPU()),
- zap.Bool("member-initialized", memberInitialized),
- zap.String("name", sc.Name),
- zap.String("data-dir", sc.DataDir),
- zap.String("wal-dir", ec.WalDir),
- zap.String("wal-dir-dedicated", sc.DedicatedWALDir),
- zap.String("member-dir", sc.MemberDir()),
- zap.Bool("force-new-cluster", sc.ForceNewCluster),
- zap.String("heartbeat-interval", fmt.Sprintf("%v", time.Duration(sc.TickMs)*time.Millisecond)),
- zap.String("election-timeout", fmt.Sprintf("%v", time.Duration(sc.ElectionTicks*int(sc.TickMs))*time.Millisecond)),
- zap.Bool("initial-election-tick-advance", sc.InitialElectionTickAdvance),
- zap.Uint64("snapshot-count", sc.SnapshotCount),
- zap.Uint64("snapshot-catchup-entries", sc.SnapshotCatchUpEntries),
- zap.Strings("initial-advertise-peer-urls", ec.getAPURLs()),
- zap.Strings("listen-peer-urls", ec.getLPURLs()),
- zap.Strings("advertise-client-urls", ec.getACURLs()),
- zap.Strings("listen-client-urls", ec.getLCURLs()),
- zap.Strings("listen-metrics-urls", ec.getMetricsURLs()),
- zap.Strings("cors", cors),
- zap.Strings("host-whitelist", hss),
- zap.String("initial-cluster", sc.InitialPeerURLsMap.String()),
- zap.String("initial-cluster-state", ec.ClusterState),
- zap.String("initial-cluster-token", sc.InitialClusterToken),
- zap.Int64("quota-size-bytes", quota),
- zap.Bool("pre-vote", sc.PreVote),
- zap.Bool("initial-corrupt-check", sc.InitialCorruptCheck),
- zap.String("corrupt-check-time-interval", sc.CorruptCheckTime.String()),
- zap.String("auto-compaction-mode", sc.AutoCompactionMode),
- zap.Duration("auto-compaction-retention", sc.AutoCompactionRetention),
- zap.String("auto-compaction-interval", sc.AutoCompactionRetention.String()),
- zap.String("discovery-url", sc.DiscoveryURL),
- zap.String("discovery-proxy", sc.DiscoveryProxy),
- )
- }
-}
-
// Config returns the current configuration.
func (e *Etcd) Config() Config {
return e.cfg
@@ -349,23 +219,6 @@
// Client requests will be terminated with request timeout.
// After timeout, enforce remaning requests be closed immediately.
func (e *Etcd) Close() {
- fields := []zap.Field{
- zap.String("name", e.cfg.Name),
- zap.String("data-dir", e.cfg.Dir),
- zap.Strings("advertise-peer-urls", e.cfg.getAPURLs()),
- zap.Strings("advertise-client-urls", e.cfg.getACURLs()),
- }
- lg := e.GetLogger()
- if lg != nil {
- lg.Info("closing etcd server", fields...)
- }
- defer func() {
- if lg != nil {
- lg.Info("closed etcd server", fields...)
- lg.Sync()
- }
- }()
-
e.closeOnce.Do(func() { close(e.stopc) })
// close client requests with request timeout
@@ -420,7 +273,7 @@
// do not grpc.Server.GracefulStop with TLS enabled etcd server
// See https://github.com/grpc/grpc-go/issues/1384#issuecomment-317124531
- // and https://github.com/etcd-io/etcd/issues/8916
+ // and https://github.com/coreos/etcd/issues/8916
if ss.secure {
shutdownNow()
return
@@ -449,27 +302,15 @@
func (e *Etcd) Err() <-chan error { return e.errc }
-func configurePeerListeners(cfg *Config) (peers []*peerListener, err error) {
+func startPeerListeners(cfg *Config) (peers []*peerListener, err error) {
if err = updateCipherSuites(&cfg.PeerTLSInfo, cfg.CipherSuites); err != nil {
return nil, err
}
if err = cfg.PeerSelfCert(); err != nil {
- if cfg.logger != nil {
- cfg.logger.Fatal("failed to get peer self-signed certs", zap.Error(err))
- } else {
- plog.Fatalf("could not get certs (%v)", err)
- }
+ plog.Fatalf("could not get certs (%v)", err)
}
if !cfg.PeerTLSInfo.Empty() {
- if cfg.logger != nil {
- cfg.logger.Info(
- "starting with peer TLS",
- zap.String("tls-info", fmt.Sprintf("%+v", cfg.PeerTLSInfo)),
- zap.Strings("cipher-suites", cfg.CipherSuites),
- )
- } else {
- plog.Infof("peerTLS: %s", cfg.PeerTLSInfo)
- }
+ plog.Infof("peerTLS: %s", cfg.PeerTLSInfo)
}
peers = make([]*peerListener, len(cfg.LPUrls))
@@ -479,15 +320,7 @@
}
for i := range peers {
if peers[i] != nil && peers[i].close != nil {
- if cfg.logger != nil {
- cfg.logger.Warn(
- "closing peer listener",
- zap.String("address", cfg.LPUrls[i].String()),
- zap.Error(err),
- )
- } else {
- plog.Info("stopping listening for peers on ", cfg.LPUrls[i].String())
- }
+ plog.Info("stopping listening for peers on ", cfg.LPUrls[i].String())
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
peers[i].close(ctx)
cancel()
@@ -498,18 +331,10 @@
for i, u := range cfg.LPUrls {
if u.Scheme == "http" {
if !cfg.PeerTLSInfo.Empty() {
- if cfg.logger != nil {
- cfg.logger.Warn("scheme is HTTP while key and cert files are present; ignoring key and cert files", zap.String("peer-url", u.String()))
- } else {
- plog.Warningf("The scheme of peer url %s is HTTP while peer key/cert files are presented. Ignored peer key/cert files.", u.String())
- }
+ plog.Warningf("The scheme of peer url %s is HTTP while peer key/cert files are presented. Ignored peer key/cert files.", u.String())
}
if cfg.PeerTLSInfo.ClientCertAuth {
- if cfg.logger != nil {
- cfg.logger.Warn("scheme is HTTP while --peer-client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("peer-url", u.String()))
- } else {
- plog.Warningf("The scheme of peer url %s is HTTP while client cert auth (--peer-client-cert-auth) is enabled. Ignored client cert auth for this url.", u.String())
- }
+ plog.Warningf("The scheme of peer url %s is HTTP while client cert auth (--peer-client-cert-auth) is enabled. Ignored client cert auth for this url.", u.String())
}
}
peers[i] = &peerListener{close: func(context.Context) error { return nil }}
@@ -521,13 +346,14 @@
peers[i].close = func(context.Context) error {
return peers[i].Listener.Close()
}
+ plog.Info("listening for peers on ", u.String())
}
return peers, nil
}
// configure peer handlers after rafthttp.Transport started
func (e *Etcd) servePeers() (err error) {
- ph := etcdhttp.NewPeerHandler(e.GetLogger(), e.Server)
+ ph := etcdhttp.NewPeerHandler(e.Server)
var peerTLScfg *tls.Config
if !e.cfg.PeerTLSInfo.Empty() {
if peerTLScfg, err = e.cfg.PeerTLSInfo.ServerConfig(); err != nil {
@@ -536,7 +362,6 @@
}
for _, p := range e.Peers {
- u := p.Listener.Addr().String()
gs := v3rpc.Server(e.Server, peerTLScfg)
m := cmux.New(p.Listener)
go gs.Serve(m.Match(cmux.HTTP2()))
@@ -551,19 +376,7 @@
// gracefully shutdown http.Server
// close open listeners, idle connections
// until context cancel or time-out
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "stopping serving peer traffic",
- zap.String("address", u),
- )
- }
stopServers(ctx, &servers{secure: peerTLScfg != nil, grpc: gs, http: srv})
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "stopped serving peer traffic",
- zap.String("address", u),
- )
- }
return nil
}
}
@@ -571,70 +384,45 @@
// start peer servers in a goroutine
for _, pl := range e.Peers {
go func(l *peerListener) {
- u := l.Addr().String()
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "serving peer traffic",
- zap.String("address", u),
- )
- } else {
- plog.Info("listening for peers on ", u)
- }
e.errHandler(l.serve())
}(pl)
}
return nil
}
-func configureClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
+func startClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
if err = updateCipherSuites(&cfg.ClientTLSInfo, cfg.CipherSuites); err != nil {
return nil, err
}
if err = cfg.ClientSelfCert(); err != nil {
- if cfg.logger != nil {
- cfg.logger.Fatal("failed to get client self-signed certs", zap.Error(err))
- } else {
- plog.Fatalf("could not get certs (%v)", err)
- }
+ plog.Fatalf("could not get certs (%v)", err)
}
if cfg.EnablePprof {
- if cfg.logger != nil {
- cfg.logger.Info("pprof is enabled", zap.String("path", debugutil.HTTPPrefixPProf))
- } else {
- plog.Infof("pprof is enabled under %s", debugutil.HTTPPrefixPProf)
- }
+ plog.Infof("pprof is enabled under %s", debugutil.HTTPPrefixPProf)
}
sctxs = make(map[string]*serveCtx)
for _, u := range cfg.LCUrls {
- sctx := newServeCtx(cfg.logger)
+ sctx := newServeCtx()
+
if u.Scheme == "http" || u.Scheme == "unix" {
if !cfg.ClientTLSInfo.Empty() {
- if cfg.logger != nil {
- cfg.logger.Warn("scheme is HTTP while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String()))
- } else {
- plog.Warningf("The scheme of client url %s is HTTP while peer key/cert files are presented. Ignored key/cert files.", u.String())
- }
+ plog.Warningf("The scheme of client url %s is HTTP while peer key/cert files are presented. Ignored key/cert files.", u.String())
}
if cfg.ClientTLSInfo.ClientCertAuth {
- if cfg.logger != nil {
- cfg.logger.Warn("scheme is HTTP while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String()))
- } else {
- plog.Warningf("The scheme of client url %s is HTTP while client cert auth (--client-cert-auth) is enabled. Ignored client cert auth for this url.", u.String())
- }
+ plog.Warningf("The scheme of client url %s is HTTP while client cert auth (--client-cert-auth) is enabled. Ignored client cert auth for this url.", u.String())
}
}
if (u.Scheme == "https" || u.Scheme == "unixs") && cfg.ClientTLSInfo.Empty() {
- return nil, fmt.Errorf("TLS key/cert (--cert-file, --key-file) must be provided for client url %s with HTTPS scheme", u.String())
+ return nil, fmt.Errorf("TLS key/cert (--cert-file, --key-file) must be provided for client url %s with HTTPs scheme", u.String())
}
- network := "tcp"
+ proto := "tcp"
addr := u.Host
if u.Scheme == "unix" || u.Scheme == "unixs" {
- network = "unix"
+ proto = "unix"
addr = u.Host + u.Path
}
- sctx.network = network
sctx.secure = u.Scheme == "https" || u.Scheme == "unixs"
sctx.insecure = !sctx.secure
@@ -644,7 +432,7 @@
continue
}
- if sctx.l, err = net.Listen(network, addr); err != nil {
+ if sctx.l, err = net.Listen(proto, addr); err != nil {
return nil, err
}
// net.Listener will rewrite ipv4 0.0.0.0 to ipv6 [::], breaking
@@ -653,37 +441,21 @@
if fdLimit, fderr := runtimeutil.FDLimit(); fderr == nil {
if fdLimit <= reservedInternalFDNum {
- if cfg.logger != nil {
- cfg.logger.Fatal(
- "file descriptor limit of etcd process is too low; please set higher",
- zap.Uint64("limit", fdLimit),
- zap.Int("recommended-limit", reservedInternalFDNum),
- )
- } else {
- plog.Fatalf("file descriptor limit[%d] of etcd process is too low, and should be set higher than %d to ensure internal usage", fdLimit, reservedInternalFDNum)
- }
+ plog.Fatalf("file descriptor limit[%d] of etcd process is too low, and should be set higher than %d to ensure internal usage", fdLimit, reservedInternalFDNum)
}
sctx.l = transport.LimitListener(sctx.l, int(fdLimit-reservedInternalFDNum))
}
- if network == "tcp" {
- if sctx.l, err = transport.NewKeepAliveListener(sctx.l, network, nil); err != nil {
+ if proto == "tcp" {
+ if sctx.l, err = transport.NewKeepAliveListener(sctx.l, "tcp", nil); err != nil {
return nil, err
}
}
+ plog.Info("listening for client requests on ", u.Host)
defer func() {
- if err == nil {
- return
- }
- sctx.l.Close()
- if cfg.logger != nil {
- cfg.logger.Warn(
- "closing peer listener",
- zap.String("address", u.Host),
- zap.Error(err),
- )
- } else {
+ if err != nil {
+ sctx.l.Close()
plog.Info("stopping listening for client requests on ", u.Host)
}
}()
@@ -704,31 +476,28 @@
func (e *Etcd) serveClients() (err error) {
if !e.cfg.ClientTLSInfo.Empty() {
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "starting with client TLS",
- zap.String("tls-info", fmt.Sprintf("%+v", e.cfg.ClientTLSInfo)),
- zap.Strings("cipher-suites", e.cfg.CipherSuites),
- )
- } else {
- plog.Infof("ClientTLS: %s", e.cfg.ClientTLSInfo)
- }
+ plog.Infof("ClientTLS: %s", e.cfg.ClientTLSInfo)
+ }
+
+ if e.cfg.CorsInfo.String() != "" {
+ plog.Infof("cors = %s", e.cfg.CorsInfo)
}
// Start a client server goroutine for each listen address
var h http.Handler
if e.Config().EnableV2 {
if len(e.Config().ExperimentalEnableV2V3) > 0 {
- srv := v2v3.NewServer(e.cfg.logger, v3client.New(e.Server), e.cfg.ExperimentalEnableV2V3)
- h = v2http.NewClientHandler(e.GetLogger(), srv, e.Server.Cfg.ReqTimeout())
+ srv := v2v3.NewServer(v3client.New(e.Server), e.cfg.ExperimentalEnableV2V3)
+ h = v2http.NewClientHandler(srv, e.Server.Cfg.ReqTimeout())
} else {
- h = v2http.NewClientHandler(e.GetLogger(), e.Server, e.Server.Cfg.ReqTimeout())
+ h = v2http.NewClientHandler(e.Server, e.Server.Cfg.ReqTimeout())
}
} else {
mux := http.NewServeMux()
etcdhttp.HandleBasic(mux, e.Server)
h = mux
}
+ h = http.Handler(&cors.CORSHandler{Handler: h, Info: e.cfg.CorsInfo})
gopts := []grpc.ServerOption{}
if e.cfg.GRPCKeepAliveMinTime > time.Duration(0) {
@@ -745,7 +514,7 @@
}))
}
- // start client servers in each goroutine
+ // start client servers in a goroutine
for _, sctx := range e.sctxs {
go func(s *serveCtx) {
e.errHandler(s.serve(e.Server, &e.cfg.ClientTLSInfo, h, e.errHandler, gopts...))
@@ -774,14 +543,7 @@
}
e.metricsListeners = append(e.metricsListeners, ml)
go func(u url.URL, ln net.Listener) {
- if e.cfg.logger != nil {
- e.cfg.logger.Info(
- "serving metrics",
- zap.String("address", u.String()),
- )
- } else {
- plog.Info("listening for metrics on ", u.String())
- }
+ plog.Info("listening for metrics on ", u.String())
e.errHandler(http.Serve(ln, metricsMux))
}(murl, ml)
}
@@ -801,21 +563,13 @@
}
}
-// GetLogger returns the logger.
-func (e *Etcd) GetLogger() *zap.Logger {
- e.cfg.loggerMu.RLock()
- l := e.cfg.logger
- e.cfg.loggerMu.RUnlock()
- return l
-}
-
func parseCompactionRetention(mode, retention string) (ret time.Duration, err error) {
h, err := strconv.Atoi(retention)
- if err == nil {
+ if err == nil && h >= 0 {
switch mode {
- case CompactorModeRevision:
+ case compactor.ModeRevision:
ret = time.Duration(int64(h))
- case CompactorModePeriodic:
+ case compactor.ModePeriodic:
ret = time.Duration(int64(h)) * time.Hour
}
} else {