Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5821 from davygeek/discovery

Browse Source 
discovery: Uniform code style
This commit is contained in:
Xiang Li 2016-06-30 07:19:08 -07:00 committed by GitHub
commit ad556b7e7d
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discovery/discovery.go
View File

@ -243,7 +243,7 @@ func (d *discovery) checkCluster() ([]*client.Node, int, uint64, error) {
} }
return nil, 0, 0, err return nil, 0, 0, err
} }
nodes := make([]*client.Node, 0) var nodes []*client.Node
// append non-config keys to nodes // append non-config keys to nodes
for _, n := range resp.Node.Nodes { for _, n := range resp.Node.Nodes {
if !(path.Base(n.Key) == path.Base(configKey)) { if !(path.Base(n.Key) == path.Base(configKey)) {

6
discovery/discovery_test.go
View File

@ -182,7 +182,7 @@ func TestCheckCluster(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
rs := make([]*client.Response, 0) var rs []*client.Response
if len(tt.nodes) > 0 { if len(tt.nodes) > 0 {
rs = append(rs, &client.Response{Node: tt.nodes[0], Index: tt.index}) rs = append(rs, &client.Response{Node: tt.nodes[0], Index: tt.index})
rs = append(rs, &client.Response{ rs = append(rs, &client.Response{
@ -267,7 +267,7 @@ func TestWaitNodes(t *testing.T) {
dBase := &discovery{cluster: "1000", c: c} dBase := &discovery{cluster: "1000", c: c}
// Retry case // Retry case
retryScanResp := make([]*client.Response, 0) var retryScanResp []*client.Response
if len(tt.nodes) > 0 { if len(tt.nodes) > 0 {
retryScanResp = append(retryScanResp, &client.Response{ retryScanResp = append(retryScanResp, &client.Response{
Node: &client.Node{ Node: &client.Node{
@ -406,7 +406,7 @@ func TestSortableNodes(t *testing.T) {
} }
sns := sortableNodes{ns} sns := sortableNodes{ns}
sort.Sort(sns) sort.Sort(sns)
cis := make([]int, 0) var cis []int
for _, n := range sns.Nodes { for _, n := range sns.Nodes {
cis = append(cis, int(n.CreatedIndex)) cis = append(cis, int(n.CreatedIndex))
} }

12
discovery/srv.go
View File

@ -33,9 +33,11 @@ var (
// Also doesn't do any lookups for the token (though it could) // Also doesn't do any lookups for the token (though it could)
// Also sees each entry as a separate instance. // Also sees each entry as a separate instance.
func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (string, string, error) { func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (string, string, error) {
stringParts := make([]string, 0) var (
stringParts []string
tcpAPUrls []string
)
tempName := int(0) tempName := int(0)
tcpAPUrls := make([]string, 0)
// First, resolve the apurls // First, resolve the apurls
for _, url := range apurls { for _, url := range apurls {
@ -68,7 +70,7 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st
} }
if n == "" { if n == "" {
n = fmt.Sprintf("%d", tempName) n = fmt.Sprintf("%d", tempName)
tempName += 1 tempName++
} }
stringParts = append(stringParts, fmt.Sprintf("%s=%s%s", n, prefix, host)) stringParts = append(stringParts, fmt.Sprintf("%s=%s%s", n, prefix, host))
plog.Noticef("got bootstrap from DNS for %s at %s%s", service, prefix, host) plog.Noticef("got bootstrap from DNS for %s at %s%s", service, prefix, host)
@ -81,12 +83,12 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st
srvErr := make([]string, 2) srvErr := make([]string, 2)
if err != nil { if err != nil {
srvErr[0] = fmt.Sprintf("error querying DNS SRV records for _etcd-server-ssl %s", err) srvErr[0] = fmt.Sprintf("error querying DNS SRV records for _etcd-server-ssl %s", err)
failCount += 1 failCount++
} }
err = updateNodeMap("etcd-server", "http://") err = updateNodeMap("etcd-server", "http://")
if err != nil { if err != nil {
srvErr[1] = fmt.Sprintf("error querying DNS SRV records for _etcd-server %s", err) srvErr[1] = fmt.Sprintf("error querying DNS SRV records for _etcd-server %s", err)
failCount += 1 failCount++
} }
if failCount == 2 { if failCount == 2 {
plog.Warningf(srvErr[0]) plog.Warningf(srvErr[0])