vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdmain: fix shadowed variables

release-3.0
Gyu-Ho Lee 2016-03-21 21:55:06 -07:00
parent e73ac5bdd7
commit 2364d71ea2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdmain/etcd.go
View File

@ -257,7 +257,8 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
return nil, err
}
if fdLimit, err := runtimeutil.FDLimit(); err == nil {
var fdLimit uint64
if fdLimit, err = runtimeutil.FDLimit(); err == nil {
if fdLimit <= reservedInternalFDNum {
plog.Fatalf("file descriptor limit[%d] of etcd process is too low, and should be set higher than %d to ensure internal usage", fdLimit, reservedInternalFDNum)
}
@ -394,13 +395,15 @@ func startProxy(cfg *config) error {
peerURLs = urls.PeerURLs
plog.Infof("proxy: using peer urls %v from cluster file %q", peerURLs, clusterfile)
case os.IsNotExist(err):
urlsmap, _, err := getPeerURLsMapAndToken(cfg, "proxy")
var urlsmap types.URLsMap
urlsmap, _, err = getPeerURLsMapAndToken(cfg, "proxy")
if err != nil {
return fmt.Errorf("error setting up initial cluster: %v", err)
}
if cfg.durl != "" {
s, err := discovery.GetCluster(cfg.durl, cfg.dproxy)
var s string
s, err = discovery.GetCluster(cfg.durl, cfg.dproxy)
if err != nil {
return err
}