detect more cases of empty directories and actual errors

2014-12-11 13:37:32 -05:00
parent 421fe128c3
commit cf7690cb51
2 changed files with 18 additions and 6 deletions
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@ -210,7 +210,10 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
 	var n raft.Node
 	var s *raft.MemoryStorage
 	var id types.ID
-	walVersion := wal.DetectVersion(cfg.DataDir)
+	walVersion, err := wal.DetectVersion(cfg.DataDir)
+	if err != nil {
+		return nil, err
+	}
 	if walVersion == wal.WALUnknown {
 		return nil, fmt.Errorf("unknown wal version in data dir %s", cfg.DataDir)
 	}