Skip to content

Commit

Permalink
Merge abb2203 into backport/snapshot-restore-tests/nominally-mighty-newt
Browse files Browse the repository at this point in the history
  • Loading branch information
hc-github-team-consul-core authored Mar 18, 2023
2 parents c3e4b78 + abb2203 commit 14b22e2
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions test/integration/consul-container/libs/cluster/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,18 @@ func NewConfigBuilder(ctx *BuildContext) *Builder {
b.conf.Set("acl.default_policy", "deny")
b.conf.Set("acl.enable_token_persistence", true)
}

ls := string(ctx.logStore)
if ls != string(LogStore_WAL) && ls != string(LogStore_BoltDB) {
ls = string(LogStore_BoltDB)
if ls != "" && (ctx.consulVersion == "local" ||
semver.Compare("v"+ctx.consulVersion, "v1.15.0") >= 0) {
// Enable logstore backend for version after v1.15.0
if ls != string(LogStore_WAL) && ls != string(LogStore_BoltDB) {
ls = string(LogStore_BoltDB)
}
b.conf.Set("raft_logstore.backend", ls)
} else {
b.conf.Unset("raft_logstore.backend")
}
b.conf.Set("raft_logstore.backend", ls)

return b
}
Expand Down

0 comments on commit 14b22e2

Please sign in to comment.