From 185d37c3339a9bc26767cdf18584b35c1309a8df Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Mon, 24 Nov 2014 20:51:04 -0800 Subject: [PATCH] etcdserver: not load dummy entry from the wal --- etcdserver/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etcdserver/server.go b/etcdserver/server.go index 3b33a30e9..cd18f2e8c 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -270,7 +270,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) { if cfg.ShouldDiscover() { log.Printf("etcdserver: warn: ignoring discovery: etcd has already been initialized and has a valid log in %q", cfg.WALDir()) } - index := uint64(1) + var index uint64 snapshot, err := ss.Load() if err != nil && err != snap.ErrNoSnapshot { return nil, err @@ -286,9 +286,9 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) { log.Printf("etcdserver: loaded peers from snapshot: %s", cfg.Cluster) } if !cfg.ForceNewCluster { - id, n, s, w = restartNode(cfg, index, snapshot) + id, n, s, w = restartNode(cfg, index+1, snapshot) } else { - id, n, s, w = restartAsStandaloneNode(cfg, index, snapshot) + id, n, s, w = restartAsStandaloneNode(cfg, index+1, snapshot) } default: return nil, fmt.Errorf("unsupported bootstrap config")