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

Merge pull request #2298 from barakmich/issue2295

Browse Source 
etcdserver: Unmask the snapshotter. Fixes #2295
This commit is contained in:
Xiang Li
2015-02-13 09:38:58 -08:00
parent b06e43b803 a0e3bc9cbd
commit 12999ba083
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/server.go
View File

@@ -206,7 +206,7 @@ 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())
ss = snap.New(cfg.SnapDir())
snapshot, err := ss.Load()
if err != nil && err != snap.ErrNoSnapshot {
return nil, err