Merge pull request #5841 from heyitsanthony/fix-be-semver

etcdserver: exit on missing backend only if semver is >= 3.0.0
This commit is contained in:
Anthony Romano 2016-07-01 10:14:05 -07:00 committed by GitHub
commit c7a0830a62

View File

@ -357,7 +357,7 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
cl.SetStore(st) cl.SetStore(st)
cl.SetBackend(be) cl.SetBackend(be)
cl.Recover() cl.Recover()
if cl.Version() != nil && cl.Version().LessThan(semver.Version{Major: 3}) && !beExist { if cl.Version() != nil && !cl.Version().LessThan(semver.Version{Major: 3}) && !beExist {
os.RemoveAll(bepath) os.RemoveAll(bepath)
return nil, fmt.Errorf("database file (%v) of the backend is missing", bepath) return nil, fmt.Errorf("database file (%v) of the backend is missing", bepath)
} }