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: correct the log about recovering from snapshot

Browse Source
This commit is contained in:
Yicheng Qin 2014-12-08 13:54:45 -08:00
parent 6bfa5d409e
commit 8c338ffcc7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/server.go
View File

@ -272,14 +272,14 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
return nil, err return nil, err
} }
if snapshot != nil { if snapshot != nil {
log.Printf("etcdserver: recovering from snapshot at index %d", snapshot.Metadata.Index)
st.Recovery(snapshot.Data) st.Recovery(snapshot.Data)
log.Printf("etcdserver: recovered store from snapshot at index %d", snapshot.Metadata.Index)
index = snapshot.Metadata.Index index = snapshot.Metadata.Index
} }
cfg.Cluster = NewClusterFromStore(cfg.Cluster.token, st) cfg.Cluster = NewClusterFromStore(cfg.Cluster.token, st)
cfg.Print() cfg.Print()
if snapshot != nil { if snapshot != nil {
log.Printf("etcdserver: loaded peers from snapshot: %s", cfg.Cluster) log.Printf("etcdserver: loaded cluster information from store: %s", cfg.Cluster)
} }
if !cfg.ForceNewCluster { if !cfg.ForceNewCluster {
id, n, s, w = restartNode(cfg, index+1, snapshot) id, n, s, w = restartNode(cfg, index+1, snapshot)