Skip to content

don't exit(1) in queue processor mode #422

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 3 commits into from
May 11, 2021
Merged

don't exit(1) in queue processor mode #422

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
732464f
don't exit(1) in queue processor mode
heschlie Apr 30, 2021
eeb4eaa
fixing up goreportcard test
heschlie May 7, 2021
eaf26ce
Rolling back go report card test changes
heschlie May 7, 2021
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: 5 additions & 3 deletions cmd/node-termination-handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func drainOrCordonIfNecessary(interruptionEventStore *interruptioneventstore.Sto
if nthConfig.CordonOnly || (drainEvent.IsRebalanceRecommendation() && !nthConfig.EnableRebalanceDraining) {
cordonNode(node, nodeName, drainEvent, metrics, recorder)
} else {
cordonAndDrainNode(node, nodeName, metrics, recorder)
cordonAndDrainNode(node, nodeName, metrics, recorder, nthConfig.EnableSQSTerminationDraining)
}

interruptionEventStore.MarkAllAsProcessed(nodeName)
Expand Down Expand Up @@ -352,7 +352,7 @@ func cordonNode(node node.Node, nodeName string, drainEvent *monitor.Interruptio
}
}

func cordonAndDrainNode(node node.Node, nodeName string, metrics observability.Metrics, recorder observability.K8sEventRecorder) {
func cordonAndDrainNode(node node.Node, nodeName string, metrics observability.Metrics, recorder observability.K8sEventRecorder, sqsTerminationDraining bool) {
err := node.CordonAndDrain(nodeName)
if err != nil {
if errors.IsNotFound(err) {
Expand All @@ -361,7 +361,9 @@ func cordonAndDrainNode(node node.Node, nodeName string, metrics observability.M
log.Err(err).Msg("There was a problem while trying to cordon and drain the node")
metrics.NodeActionsInc("cordon-and-drain", nodeName, err)
recorder.Emit(nodeName, observability.Warning, observability.CordonAndDrainErrReason, observability.CordonAndDrainErrMsgFmt, err.Error())
os.Exit(1)
if !sqsTerminationDraining {
os.Exit(1)
}
}
} else {
log.Info().Str("node_name", nodeName).Msg("Node successfully cordoned and drained")
Expand Down