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

Improved context with timeout for DrainNode #920

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Improved context with timeout for DrainNode #920

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a760940
improved drain timeout calculation
sssash18 Jun 24, 2024
25c1646
removed select for context cancellation
sssash18 Jun 25, 2024
9dde1f8
passing drain context only in drainNode
sssash18 Jul 2, 2024
ada9902
removed effective drain timeout modification
sssash18 Jul 2, 2024
9051383
create drainContext in RunDrain
sssash18 Jul 2, 2024
1b5f6e4
remove time.Sleep
sssash18 Jul 2, 2024
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
18 changes: 8 additions & 10 deletions pkg/util/provider/drain/drain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ func NewDrainOptions(
// RunDrain runs the 'drain' command
func (o *Options) RunDrain(ctx context.Context) error {
o.drainStartedOn = time.Now()
drainContext, cancelFn := context.WithDeadline(ctx, o.drainStartedOn.Add(o.Timeout))
klog.V(4).Infof(
"Machine drain started on %s for %q",
o.drainStartedOn,
Expand All @@ -197,6 +198,7 @@ func (o *Options) RunDrain(ctx context.Context) error {

defer func() {
o.drainEndedOn = time.Now()
cancelFn()
klog.Infof(
"Machine drain ended on %s and took %s for %q",
o.drainEndedOn,
Expand All @@ -205,12 +207,12 @@ func (o *Options) RunDrain(ctx context.Context) error {
)
}()

if err := o.RunCordonOrUncordon(ctx, true); err != nil {
if err := o.RunCordonOrUncordon(drainContext, true); err != nil {
klog.Errorf("Drain Error: Cordoning of node failed with error: %v", err)
return err
}

err := o.deleteOrEvictPodsSimple(ctx)
err := o.deleteOrEvictPodsSimple(drainContext)
return err
}

Expand Down Expand Up @@ -653,16 +655,12 @@ func (o *Options) evictPodsWithPVInternal(
returnCh chan error,
) (remainingPods []*corev1.Pod, fastTrack bool) {
var (
mainContext context.Context
cancelMainContext context.CancelFunc
retryPods []*corev1.Pod
retryPods []*corev1.Pod
)
mainContext, cancelMainContext = context.WithDeadline(ctx, o.drainStartedOn.Add(o.Timeout))
defer cancelMainContext()

for i, pod := range pods {
select {
case <-mainContext.Done():
case <-ctx.Done():
// Timeout occurred. Abort and report the remaining pods.
returnCh <- nil
return append(retryPods, pods[i+1:]...), true
Expand Down Expand Up @@ -739,7 +737,7 @@ func (o *Options) evictPodsWithPVInternal(
)

podVolumeInfo := podVolumeInfoMap[getPodKey(pod)]
ctx, cancelFn := context.WithTimeout(mainContext, o.getTerminationGracePeriod(pod)+o.PvDetachTimeout)
ctx, cancelFn := context.WithTimeout(ctx, o.getTerminationGracePeriod(pod)+o.PvDetachTimeout)
err = o.waitForDetach(ctx, podVolumeInfo, o.nodeName)
cancelFn()

Expand All @@ -762,7 +760,7 @@ func (o *Options) evictPodsWithPVInternal(
time.Since(podEvictionStartTime),
)

ctx, cancelFn = context.WithTimeout(mainContext, o.PvReattachTimeout)
ctx, cancelFn = context.WithTimeout(ctx, o.PvReattachTimeout)
err = o.waitForReattach(ctx, podVolumeInfo, o.nodeName, volumeAttachmentEventCh)
cancelFn()

Expand Down