mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't redeclare err and snapshot variable, fixing validation of consistent index and closing database on defer

Browse Source 
`err` variable shared throughout the NewServer function and used on line
396 to defer decision whether backend should be closed when starting
the server failed.

`snapshot` variable is first defined 407, redeclared locally on line 496 and later
again used on line 625. Creation of local variable is a bug introduced
in https://github.com/etcd-io/etcd/pull/11888.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2023-12-20 11:31:43 +01:00
parent 39330e33d6
commit a2e9dc8cc0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/etcdserver/server.go
View File

@ -35,6 +35,7 @@ import (
humanize "github.com/dustin/go-humanize" humanize "github.com/dustin/go-humanize"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/wal/walpb"
"go.uber.org/zap" "go.uber.org/zap"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
@ -485,13 +486,14 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
} }
// Find a snapshot to start/restart a raft node // Find a snapshot to start/restart a raft node
walSnaps, err := wal.ValidSnapshotEntries(cfg.Logger, cfg.WALDir()) var walSnaps []walpb.Snapshot
walSnaps, err = wal.ValidSnapshotEntries(cfg.Logger, cfg.WALDir())
if err != nil { if err != nil {
return nil, err return nil, err
} }
// snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding // snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding
// wal log entries // wal log entries
snapshot, err := ss.LoadNewestAvailable(walSnaps) snapshot, err = ss.LoadNewestAvailable(walSnaps)
if err != nil && err != snap.ErrNoSnapshot { if err != nil && err != snap.ErrNoSnapshot {
return nil, err return nil, err
} }