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

Reconcile machine before creation deadline #849

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reconcile machine before creation deadline #849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c9b9c9
Reconcile machine before creation deadline
aaronfern Sep 12, 2023
60b89e6
Address review comments
aaronfern Oct 11, 2023
815422d
Update pkg/util/provider/machinecontroller/machine.go
aaronfern Oct 25, 2023
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
5 changes: 3 additions & 2 deletions pkg/util/provider/machinecontroller/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,10 @@ func (c *controller) triggerCreationFlow(ctx context.Context, createMachineReque
// If node label is not present
klog.V(2).Infof("Creating a VM for machine %q, please wait!", machine.Name)
klog.V(2).Infof("The machine creation is triggered with timeout of %s", c.getEffectiveCreationTimeout(createMachineRequest.Machine).Duration)
createMCCtx, cancelFunc := c.getCreationContext(ctx, machine)
createMachineCtx, cancelFunc := c.getCreationContext(ctx, machine)
defer cancelFunc()
createMachineResponse, err := c.driver.CreateMachine(createMCCtx, createMachineRequest)
//TODO Adapt all mcm-providers driver method implementations to use the passed context
aaronfern marked this conversation as resolved.
Show resolved Hide resolved
createMachineResponse, err := c.driver.CreateMachine(createMachineCtx, createMachineRequest)
if err != nil {
// Create call returned an error.
klog.Errorf("Error while creating machine %s: %s", machine.Name, err.Error())
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/provider/machinecontroller/machine_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,16 +513,16 @@ func (c *controller) machineCreateErrorHandler(ctx context.Context, machine *v1a
return retryRequired, statusUpdErr
}

// adjustCreateRetryRequired adjusts the retry period if needed so that we don't have a case where the machine is reconciled after machineCreationTimeout
// if the retry period is too large so that, it is adjusted so that it causes a reconcile at the machineCreationTimeout
// adjustCreateRetryRequired adjusts the retry period if needed so that we don't have a case where the machine is reconciled long (<=ShortRetry) after machineCreationTimeout
// if the retry period is too large, it is adjusted to cause a reconcile at the machineCreationTimeout
// if the machineCreationTimeout has already passed, return `ShortRetry` so that the machine is immediately reconciled
func (c *controller) adjustCreateRetryRequired(machine *v1alpha1.Machine, retryRequired machineutils.RetryPeriod) machineutils.RetryPeriod {
adjustedRetry := retryRequired
machineCreationDeadline := machine.CreationTimestamp.Time.Add(c.getEffectiveCreationTimeout(machine).Duration)
if time.Now().After(machineCreationDeadline) {
adjustedRetry = machineutils.ShortRetry
} else if time.Now().Add(time.Duration(retryRequired)).After(machineCreationDeadline) {
// Machine will reconcile after create deadline. Adapt RetryPeriod to reconcile machine at deadline
// Machine will reconcile after create deadline, so adapt RetryPeriod to reconcile machine at deadline
adjustedRetry = machineutils.RetryPeriod(machineCreationDeadline.Sub(time.Now()))
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/util/provider/machinecontroller/machine_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2726,7 +2726,7 @@ var _ = Describe("machine_util", func() {
)
})

Describe("#Adjust Machine Create Retry Timeout", func() {
Describe("#Adjust Machine Create Retry Period if near Timeout", func() {
type setup struct {
machine *machinev1.Machine
mcCreateTimeout metav1.Duration
Expand Down Expand Up @@ -2755,6 +2755,7 @@ var _ = Describe("machine_util", func() {
adjustedRetry := c.adjustCreateRetryRequired(data.setup.machine, machineutils.RetryPeriod(data.setup.createOpRetry))

if data.expect.retryAdjusted {
// Considering time.Now() = 0
Expect(adjustedRetry).Should(BeNumerically("<=", machineutils.RetryPeriod(c.getEffectiveCreationTimeout(data.setup.machine).Duration)))
himanshu-kun marked this conversation as resolved.
Show resolved Hide resolved
} else {
Expect(adjustedRetry).To(Equal(data.setup.createOpRetry))
Expand All @@ -2775,7 +2776,7 @@ var _ = Describe("machine_util", func() {
retryAdjusted: false,
},
}),
Entry("Should adjust machine create retry period to machine create deadline if retry is set to occur after machine create deadline", &data{
Entry("Should adjust machine create retry period to retry at machine create deadline if retry is set to occur after machine create deadline", &data{
setup: setup{
createOpRetry: machineutils.RetryPeriod(4 * time.Minute),
mcCreateTimeout: metav1.Duration{Duration: 3 * time.Minute},
Expand Down