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

etcdserver: fix snapshot

Browse Source
This commit is contained in:
Xiang Li
2015-02-13 09:51:48 -08:00
parent 12999ba083
commit fbc4c8efb5
2 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etcdserver/server.go
View File

@@ -144,7 +144,6 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
var n raft.Node
var s *raft.MemoryStorage
var id types.ID
var ss *snap.Snapshotter
walVersion, err := wal.DetectVersion(cfg.DataDir)
if err != nil {
@@ -154,6 +153,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
return nil, fmt.Errorf("unknown wal version in data dir %s", cfg.DataDir)
}
haveWAL := walVersion != wal.WALNotExist
ss := snap.New(cfg.SnapDir())
switch {
case !haveWAL && !cfg.NewCluster:
@@ -206,7 +206,6 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
if cfg.ShouldDiscover() {
log.Printf("etcdserver: discovery token ignored since a cluster has already been initialized. Valid log found at %q", cfg.WALDir())
}
ss = snap.New(cfg.SnapDir())
snapshot, err := ss.Load()
if err != nil && err != snap.ErrNoSnapshot {
return nil, err