diff --git a/etcdserver/config.go b/etcdserver/config.go index 6069728f0..2381b5a71 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -266,71 +266,6 @@ func (c *ServerConfig) peerDialTimeout() time.Duration { return time.Second + time.Duration(c.ElectionTicks*int(c.TickMs))*time.Millisecond } -func (c *ServerConfig) PrintWithInitial() { c.print(true) } - -func (c *ServerConfig) Print() { c.print(false) } - -func (c *ServerConfig) print(initial bool) { - // TODO: remove this after dropping "capnslog" - if c.Logger == nil { - plog.Infof("name = %s", c.Name) - if c.ForceNewCluster { - plog.Infof("force new cluster") - } - plog.Infof("data dir = %s", c.DataDir) - plog.Infof("member dir = %s", c.MemberDir()) - if c.DedicatedWALDir != "" { - plog.Infof("dedicated WAL dir = %s", c.DedicatedWALDir) - } - plog.Infof("heartbeat = %dms", c.TickMs) - plog.Infof("election = %dms", c.ElectionTicks*int(c.TickMs)) - plog.Infof("snapshot count = %d", c.SnapshotCount) - if len(c.DiscoveryURL) != 0 { - plog.Infof("discovery URL= %s", c.DiscoveryURL) - if len(c.DiscoveryProxy) != 0 { - plog.Infof("discovery proxy = %s", c.DiscoveryProxy) - } - } - plog.Infof("advertise client URLs = %s", c.ClientURLs) - if initial { - plog.Infof("initial advertise peer URLs = %s", c.PeerURLs) - plog.Infof("initial cluster = %s", c.InitialPeerURLsMap) - } - } else { - state := "new" - if !c.NewCluster { - state = "existing" - } - c.Logger.Info( - "server configuration", - zap.String("name", c.Name), - zap.String("data-dir", c.DataDir), - zap.String("member-dir", c.MemberDir()), - zap.String("dedicated-wal-dir", c.DedicatedWALDir), - zap.Bool("force-new-cluster", c.ForceNewCluster), - zap.String("heartbeat-interval", fmt.Sprintf("%v", time.Duration(c.TickMs)*time.Millisecond)), - zap.String("election-timeout", fmt.Sprintf("%v", time.Duration(c.ElectionTicks*int(c.TickMs))*time.Millisecond)), - zap.Bool("initial-election-tick-advance", c.InitialElectionTickAdvance), - zap.Uint64("snapshot-count", c.SnapshotCount), - zap.Uint64("snapshot-catchup-entries", c.SnapshotCatchUpEntries), - zap.Strings("advertise-client-urls", c.getACURLs()), - zap.Strings("initial-advertise-peer-urls", c.getAPURLs()), - zap.Bool("initial", initial), - zap.String("initial-cluster", c.InitialPeerURLsMap.String()), - zap.String("initial-cluster-state", state), - zap.String("initial-cluster-token", c.InitialClusterToken), - zap.Bool("pre-vote", c.PreVote), - zap.Bool("initial-corrupt-check", c.InitialCorruptCheck), - zap.String("corrupt-check-time-interval", c.CorruptCheckTime.String()), - zap.String("auto-compaction-mode", c.AutoCompactionMode), - zap.Duration("auto-compaction-retention", c.AutoCompactionRetention), - zap.String("auto-compaction-interval", c.AutoCompactionRetention.String()), - zap.String("discovery-url", c.DiscoveryURL), - zap.String("discovery-proxy", c.DiscoveryProxy), - ) - } -} - func checkDuplicateURL(urlsmap types.URLsMap) bool { um := make(map[string]bool) for _, urls := range urlsmap { @@ -353,19 +288,3 @@ func (c *ServerConfig) bootstrapTimeout() time.Duration { } func (c *ServerConfig) backendPath() string { return filepath.Join(c.SnapDir(), "db") } - -func (c *ServerConfig) getAPURLs() (ss []string) { - ss = make([]string, len(c.PeerURLs)) - for i := range c.PeerURLs { - ss[i] = c.PeerURLs[i].String() - } - return ss -} - -func (c *ServerConfig) getACURLs() (ss []string) { - ss = make([]string, len(c.ClientURLs)) - for i := range c.ClientURLs { - ss[i] = c.ClientURLs[i].String() - } - return ss -} diff --git a/etcdserver/quota.go b/etcdserver/quota.go index af835992f..143cb35a2 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -66,7 +66,7 @@ var ( // only log once quotaLogOnce sync.Once - defaultQuotaSize = humanize.Bytes(uint64(DefaultQuotaBytes)) + DefaultQuotaSize = humanize.Bytes(uint64(DefaultQuotaBytes)) maxQuotaSize = humanize.Bytes(uint64(MaxQuotaBytes)) ) @@ -99,7 +99,7 @@ func NewBackendQuota(s *EtcdServer, name string) Quota { "enabled backend quota with default value", zap.String("quota-name", name), zap.Int64("quota-size-bytes", DefaultQuotaBytes), - zap.String("quota-size", defaultQuotaSize), + zap.String("quota-size", DefaultQuotaSize), ) } }) diff --git a/etcdserver/server.go b/etcdserver/server.go index 01b16d5a4..5f6110bbf 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -357,7 +357,6 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) { cl.SetID(types.ID(0), existingCluster.ID()) cl.SetStore(st) cl.SetBackend(be) - cfg.Print() id, n, s, w = startNode(cfg, cl, nil) cl.SetID(id, existingCluster.ID()) @@ -393,7 +392,6 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) { } cl.SetStore(st) cl.SetBackend(be) - cfg.PrintWithInitial() id, n, s, w = startNode(cfg, cl, cl.MemberIDs()) cl.SetID(id, cl.ID()) @@ -458,8 +456,6 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) { } } - cfg.Print() - if !cfg.ForceNewCluster { id, cl, n, s, w = restartNode(cfg, snapshot) } else {