From a450dc7f91cde674197331c87dd4cfdba24b6947 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 5 Aug 2021 11:53:47 +0200 Subject: [PATCH] server: Rename function to NewConfigChangeEntries indicating we are not reading it from wal --- server/etcdserver/bootstrap.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/etcdserver/bootstrap.go b/server/etcdserver/bootstrap.go index 0cd73ddb1..31d6f6408 100644 --- a/server/etcdserver/bootstrap.go +++ b/server/etcdserver/bootstrap.go @@ -532,7 +532,7 @@ func bootstrapWALFromSnapshot(cfg config.ServerConfig, snapshot *raftpb.Snapshot if cfg.ForceNewCluster { // discard the previously uncommitted entries bwal.ents = bwal.CommitedEntries() - entries := bwal.ConfigChangeEntries() + entries := bwal.NewConfigChangeEntries() // force commit config change entries bwal.AppendAndCommitEntries(entries) cfg.Logger.Info( @@ -657,7 +657,7 @@ func (wal *bootstrappedWAL) CommitedEntries() []raftpb.Entry { return wal.ents } -func (wal *bootstrappedWAL) ConfigChangeEntries() []raftpb.Entry { +func (wal *bootstrappedWAL) NewConfigChangeEntries() []raftpb.Entry { return serverstorage.CreateConfigChangeEnts( wal.lg, serverstorage.GetIDs(wal.lg, wal.snapshot, wal.ents),