mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: fixes shadowed variables for go tool vet

Browse Source 
Fix for https://github.com/coreos/etcd/issues/3954.
This commit is contained in:
Gyu-Ho Lee
2015-12-12 04:25:27 -08:00
parent bccc602c8f
commit 40b11038f2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/cluster_util.go
View File

@ -78,7 +78,7 @@ func getClusterFromRemotePeers(urls []string, timeout time.Duration, logerr bool
continue continue
} }
var membs []*Member var membs []*Member
if err := json.Unmarshal(b, &membs); err != nil { if err = json.Unmarshal(b, &membs); err != nil {
if logerr { if logerr {
plog.Warningf("could not unmarshal cluster response: %v", err) plog.Warningf("could not unmarshal cluster response: %v", err)
} }
@ -246,7 +246,7 @@ func getVersion(m *Member, rt http.RoundTripper) (*version.Versions, error) {
continue continue
} }
var vers version.Versions var vers version.Versions
if err := json.Unmarshal(b, &vers); err != nil { if err = json.Unmarshal(b, &vers); err != nil {
plog.Warningf("failed to unmarshal the response body got from the peerURL(%s) of member %s (%v)", u, m.ID, err) plog.Warningf("failed to unmarshal the response body got from the peerURL(%s) of member %s (%v)", u, m.ID, err)
continue continue
} }

8
etcdserver/raft.go
View File

@ -158,14 +158,14 @@ func (r *raftNode) start(s *EtcdServer) {
} }
} }
apply := apply{ ap := apply{
entries: rd.CommittedEntries, entries: rd.CommittedEntries,
snapshot: rd.Snapshot, snapshot: rd.Snapshot,
done: make(chan struct{}), done: make(chan struct{}),
} }
select { select {
case r.applyc <- apply: case r.applyc <- ap:
case <-r.stopped: case <-r.stopped:
return return
} }
@ -185,7 +185,7 @@ func (r *raftNode) start(s *EtcdServer) {
r.s.send(rd.Messages) r.s.send(rd.Messages)
select { select {
case <-apply.done: case <-ap.done:
case <-r.stopped: case <-r.stopped:
return return
} }
@ -253,7 +253,7 @@ func startNode(cfg *ServerConfig, cl *cluster, ids []types.ID) (id types.ID, n r
ClusterID: uint64(cl.ID()), ClusterID: uint64(cl.ID()),
}, },
) )
if err := os.MkdirAll(cfg.SnapDir(), privateDirMode); err != nil { if err = os.MkdirAll(cfg.SnapDir(), privateDirMode); err != nil {
plog.Fatalf("create snapshot directory error: %v", err) plog.Fatalf("create snapshot directory error: %v", err)
} }
if w, err = wal.Create(cfg.WALDir(), metadata); err != nil { if w, err = wal.Create(cfg.WALDir(), metadata); err != nil {

2
etcdserver/server.go
View File

@ -1037,7 +1037,7 @@ func (s *EtcdServer) snapshot(snapi uint64, confState raftpb.ConfState) {
} }
// SaveSnap saves the snapshot and releases the locked wal files // SaveSnap saves the snapshot and releases the locked wal files
// to the snapshot index. // to the snapshot index.
if err := s.r.storage.SaveSnap(snap); err != nil { if err = s.r.storage.SaveSnap(snap); err != nil {
plog.Fatalf("save snapshot error: %v", err) plog.Fatalf("save snapshot error: %v", err)
} }
plog.Infof("saved snapshot at index %d", snap.Metadata.Index) plog.Infof("saved snapshot at index %d", snap.Metadata.Index)