Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ jepsen/store/
jepsen/docker/id_rsa
jepsen/.ssh/

# Go build cache
# Build and lint cache directories
.cache/
.golangci-cache/
24 changes: 22 additions & 2 deletions multiraft_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,43 @@ func newRaftGroup(raftID string, group groupSpec, baseDir string, multi bool, bo

ldb, err := boltdb.NewBoltStore(filepath.Join(dir, "logs.dat"))
if err != nil {
// No cleanup needed here - ldb creation failed, so no resource was allocated
return nil, nil, errors.WithStack(err)
}

sdb, err := boltdb.NewBoltStore(filepath.Join(dir, "stable.dat"))
// Define cleanup function immediately after ldb is created to ensure
// proper cleanup in all error paths. If we return before this point,
// no cleanup is needed since ldb creation failed.
var sdb *boltdb.BoltStore
var r *raft.Raft
cleanup := func() {
if ldb != nil {
_ = ldb.Close()
}
if sdb != nil {
_ = sdb.Close()
}
}

sdb, err = boltdb.NewBoltStore(filepath.Join(dir, "stable.dat"))
if err != nil {
cleanup()
return nil, nil, errors.WithStack(err)
}

fss, err := raft.NewFileSnapshotStore(dir, snapshotRetainCount, os.Stderr)
if err != nil {
cleanup()
return nil, nil, errors.WithStack(err)
}

tm := transport.New(raft.ServerAddress(group.address), []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
})

r, err := raft.NewRaft(c, fsm, ldb, sdb, fss, tm.Transport())
r, err = raft.NewRaft(c, fsm, ldb, sdb, fss, tm.Transport())
if err != nil {
cleanup()
return nil, nil, errors.WithStack(err)
}

Expand All @@ -78,6 +96,8 @@ func newRaftGroup(raftID string, group groupSpec, baseDir string, multi bool, bo
}
f := r.BootstrapCluster(cfg)
if err := f.Error(); err != nil {
_ = r.Shutdown().Error()
cleanup()
return nil, nil, errors.WithStack(err)
}
}
Expand Down
Loading