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

etcdmian: fix initialization confilct

Browse Source 
Fix #3142

Ignore flags if etcd is already initialized.
This commit is contained in:
Xiang Li 2015-07-19 09:53:57 +08:00 committed by Yicheng Qin
parent 24db661401
commit 6be02ff5ec
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etcdmain/etcd.go
View File

@ -93,9 +93,16 @@ func Main() {
which := identifyDataDirOrDie(cfg.dir) which := identifyDataDirOrDie(cfg.dir)
if which != dirEmpty { if which != dirEmpty {
plog.Noticef("the server is already initialized as %v before, starting as etcd %v...", which, which) plog.Noticef("the server is already initialized as %v before, starting as etcd %v...", which, which)
switch which {
case dirMember:
stopped, err = startEtcd(cfg)
case dirProxy:
err = startProxy(cfg)
default:
plog.Panicf("unhandled dir type %v", which)
} }
} else {
shouldProxy := cfg.isProxy() || which == dirProxy shouldProxy := cfg.isProxy()
if !shouldProxy { if !shouldProxy {
stopped, err = startEtcd(cfg) stopped, err = startEtcd(cfg)
if err == discovery.ErrFullCluster && cfg.shouldFallbackToProxy() { if err == discovery.ErrFullCluster && cfg.shouldFallbackToProxy() {
@ -106,6 +113,8 @@ func Main() {
if shouldProxy { if shouldProxy {
err = startProxy(cfg) err = startProxy(cfg)
} }
}
if err != nil { if err != nil {
switch err { switch err {
case discovery.ErrDuplicateID: case discovery.ErrDuplicateID: