change priorty of reboot queue cancel #715
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masa213f
requested changes
Mar 28, 2024
server/control.go
Outdated
| @@ -346,13 +346,15 @@ func (c Controller) runOnce(ctx context.Context, leaderKey string, tick <-chan t | |||
| newlyDrained := op.ChooseDrainedNodes(cluster, apiServers, rqEntries) | |||
| drainCompleted, drainTimedout, _ := op.CheckDrainCompletion(ctx, inf, nf.HealthyAPIServer(), cluster, rqEntries) | |||
| rebootDequeued := op.CheckRebootDequeue(ctx, cluster, rqEntries) | |||
| RebootCancelled := op.CheckRebootCancelled(ctx, cluster, rqEntries) | |||
There was a problem hiding this comment.
Please use lowercase.
Suggested change
| RebootCancelled := op.CheckRebootCancelled(ctx, cluster, rqEntries) | |
| rebootCancelled := op.CheckRebootCancelled(ctx, cluster, rqEntries) |
server/strategy.go
Outdated
| @@ -883,6 +884,11 @@ func rebootOps(c *cke.Cluster, constraints *cke.Constraints, rebootArgs DecideOp | |||
| return nil, false | |||
| } | |||
|
|
|||
| if len(rebootArgs.RebootCancelled) > 0 { | |||
| phaseReboot = true | |||
| ops = append(ops, op.RebootDequeueOp(rebootArgs.RebootCancelled)) | |||
There was a problem hiding this comment.
I want to change the display name of the op to reboot-cancel.
Is it possible?
There was a problem hiding this comment.
We can change the display name by duplicating RebootDequeueOp and changing Name() method.
The logic of Op is identical. so I created RebootCancelOp which has embedded RebootDequeueOp and override Name() method.
masa213f
requested changes
Apr 1, 2024
server/strategy.go
Outdated
| @@ -883,6 +884,11 @@ func rebootOps(c *cke.Cluster, constraints *cke.Constraints, rebootArgs DecideOp | |||
| return nil, false | |||
| } | |||
|
|
|||
| if len(rebootArgs.RebootCancelled) > 0 { | |||
| phaseReboot = true | |||
| ops = append(ops, op.RebootDequeueOp(rebootArgs.RebootCancelled)) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the current CKE, the dequeue operation of cancelled reboot queue entry has lower priority than other operations like drain, reboot, ...etc.
This implementation causes the dequeue operation not to work correctly when we cancel an entry whose node is under operation.
This PR solves the problem by following changes.