mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
*: fixed some warning
This commit is contained in:
parent
ad556b7e7d
commit
8c96d2573f
@ -46,7 +46,7 @@ func isRangeEqual(a, b *rangePerm) bool {
|
|||||||
// If there are equal ranges, removeSubsetRangePerms only keeps one of them.
|
// If there are equal ranges, removeSubsetRangePerms only keeps one of them.
|
||||||
func removeSubsetRangePerms(perms []*rangePerm) []*rangePerm {
|
func removeSubsetRangePerms(perms []*rangePerm) []*rangePerm {
|
||||||
// TODO(mitake): currently it is O(n^2), we need a better algorithm
|
// TODO(mitake): currently it is O(n^2), we need a better algorithm
|
||||||
newp := make([]*rangePerm, 0)
|
var newp []*rangePerm
|
||||||
|
|
||||||
for i := range perms {
|
for i := range perms {
|
||||||
skip := false
|
skip := false
|
||||||
@ -81,7 +81,7 @@ func removeSubsetRangePerms(perms []*rangePerm) []*rangePerm {
|
|||||||
|
|
||||||
// mergeRangePerms merges adjacent rangePerms.
|
// mergeRangePerms merges adjacent rangePerms.
|
||||||
func mergeRangePerms(perms []*rangePerm) []*rangePerm {
|
func mergeRangePerms(perms []*rangePerm) []*rangePerm {
|
||||||
merged := make([]*rangePerm, 0)
|
var merged []*rangePerm
|
||||||
perms = removeSubsetRangePerms(perms)
|
perms = removeSubsetRangePerms(perms)
|
||||||
sort.Sort(RangePermSliceByBegin(perms))
|
sort.Sort(RangePermSliceByBegin(perms))
|
||||||
|
|
||||||
|
@ -389,7 +389,7 @@ func (l *lessor) sendKeepAliveLoop(stream pb.Lease_LeaseKeepAliveClient) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
tosend := make([]LeaseID, 0)
|
var tosend []LeaseID
|
||||||
|
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
l.mu.Lock()
|
l.mu.Lock()
|
||||||
|
@ -104,7 +104,7 @@ type config struct {
|
|||||||
// clustering
|
// clustering
|
||||||
apurls, acurls []url.URL
|
apurls, acurls []url.URL
|
||||||
clusterState *flags.StringsFlag
|
clusterState *flags.StringsFlag
|
||||||
DnsCluster string `json:"discovery-srv"`
|
DNSCluster string `json:"discovery-srv"`
|
||||||
Dproxy string `json:"discovery-proxy"`
|
Dproxy string `json:"discovery-proxy"`
|
||||||
Durl string `json:"discovery"`
|
Durl string `json:"discovery"`
|
||||||
fallback *flags.StringsFlag
|
fallback *flags.StringsFlag
|
||||||
@ -210,7 +210,7 @@ func NewConfig() *config {
|
|||||||
plog.Panicf("unexpected error setting up discovery-fallback flag: %v", err)
|
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.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.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.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').")
|
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 != ""),
|
"listen-client-urls": (cfg.LCUrlsCfgFile != ""),
|
||||||
"advertise-client-urls": (cfg.AcurlsCfgFile != ""),
|
"advertise-client-urls": (cfg.AcurlsCfgFile != ""),
|
||||||
"initial-cluster": (cfg.InitialCluster != ""),
|
"initial-cluster": (cfg.InitialCluster != ""),
|
||||||
"discovery-srv": (cfg.DnsCluster != ""),
|
"discovery-srv": (cfg.DNSCluster != ""),
|
||||||
}
|
}
|
||||||
|
|
||||||
return cfg.validateConfig(func(field string) bool {
|
return cfg.validateConfig(func(field string) bool {
|
||||||
@ -424,7 +424,7 @@ func (cfg *config) validateConfig(isSet func(field string) bool) error {
|
|||||||
nSet := 0
|
nSet := 0
|
||||||
for _, v := range []bool{isSet("discovery"), isSet("initial-cluster"), isSet("discovery-srv")} {
|
for _, v := range []bool{isSet("discovery"), isSet("initial-cluster"), isSet("discovery-srv")} {
|
||||||
if v {
|
if v {
|
||||||
nSet += 1
|
nSet++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,7 +242,7 @@ func TestConfigParsingConflictClusteringFlags(t *testing.T) {
|
|||||||
func TestConfigFileConflictClusteringFlags(t *testing.T) {
|
func TestConfigFileConflictClusteringFlags(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
InitialCluster string `json:"initial-cluster"`
|
InitialCluster string `json:"initial-cluster"`
|
||||||
DnsCluster string `json:"discovery-srv"`
|
DNSCluster string `json:"discovery-srv"`
|
||||||
Durl string `json:"discovery"`
|
Durl string `json:"discovery"`
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
@ -250,17 +250,17 @@ func TestConfigFileConflictClusteringFlags(t *testing.T) {
|
|||||||
Durl: "http://example.com/abc",
|
Durl: "http://example.com/abc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
DnsCluster: "example.com",
|
DNSCluster: "example.com",
|
||||||
Durl: "http://example.com/abc",
|
Durl: "http://example.com/abc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
InitialCluster: "0=localhost:8000",
|
InitialCluster: "0=localhost:8000",
|
||||||
DnsCluster: "example.com",
|
DNSCluster: "example.com",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
InitialCluster: "0=localhost:8000",
|
InitialCluster: "0=localhost:8000",
|
||||||
Durl: "http://example.com/abc",
|
Durl: "http://example.com/abc",
|
||||||
DnsCluster: "example.com",
|
DNSCluster: "example.com",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,7 +428,7 @@ func startProxy(cfg *config) error {
|
|||||||
if cfg.Durl != "" {
|
if cfg.Durl != "" {
|
||||||
plog.Warningf("discovery token ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile)
|
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)
|
plog.Warningf("DNS SRV discovery ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile)
|
||||||
}
|
}
|
||||||
urls := struct{ PeerURLs []string }{}
|
urls := struct{ PeerURLs []string }{}
|
||||||
@ -547,9 +547,9 @@ func getPeerURLsMapAndToken(cfg *config, which string) (urlsmap types.URLsMap, t
|
|||||||
// self's advertised peer URLs
|
// self's advertised peer URLs
|
||||||
urlsmap[cfg.Name] = cfg.apurls
|
urlsmap[cfg.Name] = cfg.apurls
|
||||||
token = cfg.Durl
|
token = cfg.Durl
|
||||||
case cfg.DnsCluster != "":
|
case cfg.DNSCluster != "":
|
||||||
var clusterStr string
|
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 {
|
if err != nil {
|
||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user