Skip to content

Simplify active nodes update #276

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

Merged
secwall merged 1 commit into from
Apr 20, 2026
+14 −12
Merged

Simplify active nodes update #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions internal/app/active_nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ func (app *App) actualizeQuorumReplicas(master string, activeNodes []string) err
func (app *App) updateActiveNodes(state, stateDcs map[string]*HostState, oldActiveNodes []string, master string) error {
activeNodes := app.calcActiveNodes(state, stateDcs, oldActiveNodes, master)

var addNodes []string
removingNodes := false

for _, node := range activeNodes {
if !slices.Contains(oldActiveNodes, node) {
addNodes = append(addNodes, node)
for _, node := range oldActiveNodes {
if !slices.Contains(activeNodes, node) {
removingNodes = true
break
}
}

if len(addNodes) > 0 {
addNodes = append(addNodes, oldActiveNodes...)
err := app.dcs.Set(pathActiveNodes, addNodes)
if removingNodes {
err := app.dcs.Set(pathActiveNodes, activeNodes)
if err != nil {
app.logger.Error("Update active nodes: failed to update active nodes in dcs", slog.Any("error", err))
return err
Expand All @@ -87,10 +87,12 @@ func (app *App) updateActiveNodes(state, stateDcs map[string]*HostState, oldActi
return err
}

err = app.dcs.Set(pathActiveNodes, activeNodes)
if err != nil {
app.logger.Error("Update active nodes: failed to update active nodes in dcs", slog.Any("error", err))
return err
if !removingNodes {
err := app.dcs.Set(pathActiveNodes, activeNodes)
if err != nil {
app.logger.Error("Update active nodes: failed to update active nodes in dcs", slog.Any("error", err))
return err
}
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/app/repair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (app *App) repairMaster(node *valkey.Node, activeNodes []string, state *Hos
app.logger.Error("Unable to get actual num quorum replicas on master", slog.String("fqdn", node.FQDN()), slog.Any("error", err))
return
}
if actualNumReplicas != expectedNumReplicas {
if expectedNumReplicas > actualNumReplicas {
app.logger.Info(fmt.Sprintf("Changing num quorum replicas from %d to %d on master", actualNumReplicas, expectedNumReplicas), slog.String("fqdn", node.FQDN()))
err, rewriteErr := node.SetNumQuorumReplicas(app.ctx, expectedNumReplicas)
if err != nil {
Expand Down
Loading