Skip to content

chore: Only log that the command succeeded when it actually did #2302

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
merged 1 commit into from
Jun 12, 2025
Merged

chore: Only log that the command succeeded when it actually did #2302

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
8 changes: 3 additions & 5 deletions pkg/controllers/disruption/orchestration/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"errors"
"fmt"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -228,13 +227,12 @@ func (q *Queue) Reconcile(ctx context.Context) (reconcile.Result, error) {
multiErr := multierr.Combine(err, cmd.lastError, state.RequireNoScheduleTaint(ctx, q.kubeClient, false, cmd.candidates...))
multiErr = multierr.Combine(multiErr, state.ClearNodeClaimsCondition(ctx, q.kubeClient, v1.ConditionTypeDisruptionReason, cmd.candidates...))
// Log the error
log.FromContext(ctx).WithValues("nodes", strings.Join(lo.Map(cmd.candidates, func(s *state.StateNode, _ int) string {
return s.Name()
}), ",")).Error(multiErr, "failed terminating nodes while executing a disruption command")
log.FromContext(ctx).Error(multiErr, "failed terminating nodes while executing a disruption command")
Copy link
Member Author

@jonathan-innis jonathan-innis Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values that includes the nodes that we are replacing is already injected into the log context above

} else {
log.FromContext(ctx).V(1).Info("command succeeded")
}
// If command is complete, remove command from queue.
q.Remove(cmd)
log.FromContext(ctx).V(1).Info("command succeeded")
return reconcile.Result{RequeueAfter: singleton.RequeueImmediately}, nil
}

Expand Down
Loading