From 8c96d2573f5b01a9074681e830ac9ea00911f804 Mon Sep 17 00:00:00 2001 From: davygeek Date: Thu, 30 Jun 2016 23:13:46 +0800 Subject: [PATCH] *: fixed some warning --- auth/range_perm_cache.go | 4 ++-- clientv3/lease.go | 2 +- etcdmain/config.go | 8 ++++---- etcdmain/config_test.go | 8 ++++---- etcdmain/etcd.go | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index e5525cd4b..108ee9612 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -46,7 +46,7 @@ func isRangeEqual(a, b *rangePerm) bool { // If there are equal ranges, removeSubsetRangePerms only keeps one of them. func removeSubsetRangePerms(perms []*rangePerm) []*rangePerm { // TODO(mitake): currently it is O(n^2), we need a better algorithm - newp := make([]*rangePerm, 0) + var newp []*rangePerm for i := range perms { skip := false @@ -81,7 +81,7 @@ func removeSubsetRangePerms(perms []*rangePerm) []*rangePerm { // mergeRangePerms merges adjacent rangePerms. func mergeRangePerms(perms []*rangePerm) []*rangePerm { - merged := make([]*rangePerm, 0) + var merged []*rangePerm perms = removeSubsetRangePerms(perms) sort.Sort(RangePermSliceByBegin(perms)) diff --git a/clientv3/lease.go b/clientv3/lease.go index a91b33502..839ff9d3d 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -389,7 +389,7 @@ func (l *lessor) sendKeepAliveLoop(stream pb.Lease_LeaseKeepAliveClient) { return } - tosend := make([]LeaseID, 0) + var tosend []LeaseID now := time.Now() l.mu.Lock() diff --git a/etcdmain/config.go b/etcdmain/config.go index 3d987b766..0a6fe423d 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -104,7 +104,7 @@ type config struct { // clustering apurls, acurls []url.URL clusterState *flags.StringsFlag - DnsCluster string `json:"discovery-srv"` + DNSCluster string `json:"discovery-srv"` Dproxy string `json:"discovery-proxy"` Durl string `json:"discovery"` fallback *flags.StringsFlag @@ -210,7 +210,7 @@ func NewConfig() *config { plog.Panicf("unexpected error setting up discovery-fallback flag: %v", err) } fs.StringVar(&cfg.Dproxy, "discovery-proxy", "", "HTTP proxy to use for traffic to discovery service.") - fs.StringVar(&cfg.DnsCluster, "discovery-srv", "", "DNS domain used to bootstrap initial cluster.") + fs.StringVar(&cfg.DNSCluster, "discovery-srv", "", "DNS domain used to bootstrap initial cluster.") fs.StringVar(&cfg.InitialCluster, "initial-cluster", initialClusterFromName(defaultName), "Initial cluster configuration for bootstrapping.") fs.StringVar(&cfg.InitialClusterToken, "initial-cluster-token", "etcd-cluster", "Initial cluster token for the etcd cluster during bootstrap.") fs.Var(cfg.clusterState, "initial-cluster-state", "Initial cluster state ('new' or 'existing').") @@ -401,7 +401,7 @@ func (cfg *config) configFromFile() error { "listen-client-urls": (cfg.LCUrlsCfgFile != ""), "advertise-client-urls": (cfg.AcurlsCfgFile != ""), "initial-cluster": (cfg.InitialCluster != ""), - "discovery-srv": (cfg.DnsCluster != ""), + "discovery-srv": (cfg.DNSCluster != ""), } return cfg.validateConfig(func(field string) bool { @@ -424,7 +424,7 @@ func (cfg *config) validateConfig(isSet func(field string) bool) error { nSet := 0 for _, v := range []bool{isSet("discovery"), isSet("initial-cluster"), isSet("discovery-srv")} { if v { - nSet += 1 + nSet++ } } diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go index e9c58bc1b..ef402352f 100644 --- a/etcdmain/config_test.go +++ b/etcdmain/config_test.go @@ -242,7 +242,7 @@ func TestConfigParsingConflictClusteringFlags(t *testing.T) { func TestConfigFileConflictClusteringFlags(t *testing.T) { tests := []struct { InitialCluster string `json:"initial-cluster"` - DnsCluster string `json:"discovery-srv"` + DNSCluster string `json:"discovery-srv"` Durl string `json:"discovery"` }{ { @@ -250,17 +250,17 @@ func TestConfigFileConflictClusteringFlags(t *testing.T) { Durl: "http://example.com/abc", }, { - DnsCluster: "example.com", + DNSCluster: "example.com", Durl: "http://example.com/abc", }, { InitialCluster: "0=localhost:8000", - DnsCluster: "example.com", + DNSCluster: "example.com", }, { InitialCluster: "0=localhost:8000", Durl: "http://example.com/abc", - DnsCluster: "example.com", + DNSCluster: "example.com", }, } diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 13c3af626..6293f9c48 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -428,7 +428,7 @@ func startProxy(cfg *config) error { if cfg.Durl != "" { plog.Warningf("discovery token ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile) } - if cfg.DnsCluster != "" { + if cfg.DNSCluster != "" { plog.Warningf("DNS SRV discovery ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile) } urls := struct{ PeerURLs []string }{} @@ -547,9 +547,9 @@ func getPeerURLsMapAndToken(cfg *config, which string) (urlsmap types.URLsMap, t // self's advertised peer URLs urlsmap[cfg.Name] = cfg.apurls token = cfg.Durl - case cfg.DnsCluster != "": + case cfg.DNSCluster != "": var clusterStr string - clusterStr, token, err = discovery.SRVGetCluster(cfg.Name, cfg.DnsCluster, cfg.InitialClusterToken, cfg.apurls) + clusterStr, token, err = discovery.SRVGetCluster(cfg.Name, cfg.DNSCluster, cfg.InitialClusterToken, cfg.apurls) if err != nil { return nil, "", err }