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

Return Unknown instead of NotExist

Browse Source 
Unless the data dir truly does not exist.
This commit is contained in:
Barak Michener
2014-12-11 13:09:50 -05:00
parent e4c0f5c1a8
commit 421fe128c3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wal/util.go
View File

@ -37,7 +37,7 @@ const (
func DetectVersion(dirpath string) WalVersion { func DetectVersion(dirpath string) WalVersion {
names, err := fileutil.ReadDir(dirpath) names, err := fileutil.ReadDir(dirpath)
if err != nil || len(names) == 0 { if err != nil {
return WALNotExist return WALNotExist
} }
nameSet := types.NewUnsafeSet(names...) nameSet := types.NewUnsafeSet(names...)
@ -46,7 +46,6 @@ func DetectVersion(dirpath string) WalVersion {
if Exist(path.Join(dirpath, "wal")) { if Exist(path.Join(dirpath, "wal")) {
return WALv0_5 return WALv0_5
} }
return WALNotExist
} }
if nameSet.ContainsAll([]string{"snapshot", "conf", "log"}) { if nameSet.ContainsAll([]string{"snapshot", "conf", "log"}) {
return WALv0_4 return WALv0_4