Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-3.5] Fix etcd bootstrap: Etcd not validating database consistent index, closing database and panicking on nil backend. #17151

Merged
merged 2 commits into from
Dec 20, 2023
Merged

[release-3.5] Fix etcd bootstrap: Etcd not validating database consistent index, closing database and panicking on nil backend. #17151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e9dc8
Don't redeclare err and snapshot variable, fixing validation of consi…
serathius Dec 20, 2023
d6d263a
Check if be is nil to avoid panic when be is overriden with nil by re…
serathius Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions server/etcdserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
humanize "github.com/dustin/go-humanize"
"github.com/prometheus/client_golang/prometheus"
"go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/wal/walpb"
"go.uber.org/zap"

pb "go.etcd.io/etcd/api/v3/etcdserverpb"
Expand Down Expand Up @@ -392,7 +393,7 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
}

defer func() {
if err != nil {
if be != nil && err != nil {
be.Close()
}
}()
Expand Down Expand Up @@ -485,13 +486,14 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
}

// 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 {
return nil, err
}
// snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding
// wal log entries
snapshot, err := ss.LoadNewestAvailable(walSnaps)
snapshot, err = ss.LoadNewestAvailable(walSnaps)
if err != nil && err != snap.ErrNoSnapshot {
return nil, err
}
Expand Down
Loading