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

Bug 2090358: Move drain log message to when drain starts #3168

Merged
merged 1 commit into from Jun 2, 2022
Merged

Bug 2090358: Move drain log message to when drain starts #3168

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/drain/drain_controller.go
View file
Open in desktop
Expand Up @@ -292,7 +292,6 @@ func (ctrl *Controller) syncNode(key string) error {
// This is a bit problematic in practice since we don't really have a previous state.
// TODO (jerzhang) consider using a new CRD for coordination

ctrl.logNode(node, "initiating drain")
ongoingDrain := false
for k, v := range ctrl.ongoingDrains {
if k != node.Name {
Expand All @@ -318,6 +317,7 @@ func (ctrl *Controller) syncNode(key string) error {
}

// Attempt drain
ctrl.logNode(node, "initiating drain")
if err := drain.RunNodeDrain(drainer, node.Name); err != nil {
ctrl.logNode(node, "Drain failed, but overall timeout has not been reached. Waiting 1 minute then retrying. Error message from drain: %v", err)
ctrl.enqueueAfter(node, drainRequeueDelay)
Expand Down