Skip to content

Set SchedulerHints in failover request and removed incorrect prefix #626

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
umswmayj merged 2 commits into from
Mar 25, 2026
Merged

Set SchedulerHints in failover request and removed incorrect prefix #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed7292f
Set SchedulerHints in failover request
umswmayj Mar 25, 2026
cd17719
pr feedback
umswmayj Mar 25, 2026
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: 5 additions & 0 deletions api/external/nova/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ const (
EvacuateIntent v1alpha1.SchedulingIntent = "evacuate"
// CreateIntent indicates that the request is intended for creating a new VM.
CreateIntent v1alpha1.SchedulingIntent = "create"
// ReserveForFailoverIntent indicates that the request is for failover reservation scheduling.
ReserveForFailoverIntent v1alpha1.SchedulingIntent = "reserve_for_failover"
)

// GetIntent analyzes the request spec and determines the intent of the scheduling request.
Expand All @@ -160,6 +162,9 @@ func (req ExternalSchedulerRequest) GetIntent() (v1alpha1.SchedulingIntent, erro
// See: https://github.com/sapcc/nova/blob/c88393/nova/compute/api.py#L5770
case "evacuate":
return EvacuateIntent, nil
// Used by cortex failover reservation controller
case "reserve_for_failover":
return ReserveForFailoverIntent, nil
default:
return CreateIntent, nil
}
Expand Down
5 changes: 3 additions & 2 deletions internal/scheduling/reservations/failover/reservation_scheduling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (c *FailoverReservationController) queryHypervisorsFromScheduler(ctx contex
// Note: We pass all hypervisors (from all AZs) in EligibleHosts. The scheduler pipeline's
// filter_correct_az filter will exclude hosts that are not in the VM's availability zone.
scheduleReq := reservations.ScheduleReservationRequest{
InstanceUUID: "failover-" + vm.UUID,
InstanceUUID: vm.UUID,
Copy link
Member

@PhilippMatthes PhilippMatthes Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intentional? Seems unrelated

Copy link
Collaborator Author

@umswmayj umswmayj Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but commit msg misleading changed

ProjectID: vm.ProjectID,
FlavorName: vm.FlavorName,
FlavorExtraSpecs: flavorExtraSpecs,
Expand All @@ -89,6 +89,7 @@ func (c *FailoverReservationController) queryHypervisorsFromScheduler(ctx contex
IgnoreHosts: ignoreHypervisors,
Pipeline: pipeline,
AvailabilityZone: vm.AvailabilityZone,
SchedulerHints: map[string]any{"_nova_check_type": string(api.ReserveForFailoverIntent)},
}

logger.V(1).Info("scheduling failover reservation",
Expand Down Expand Up @@ -218,7 +219,7 @@ func (c *FailoverReservationController) validateVMViaSchedulerEvacuation(
IgnoreHosts: []string{vm.CurrentHypervisor},
Pipeline: PipelineAcknowledgeFailoverReservation,
AvailabilityZone: vm.AvailabilityZone,
SchedulerHints: map[string]any{"_nova_check_type": "evacuate"},
SchedulerHints: map[string]any{"_nova_check_type": string(api.EvacuateIntent)},
}

logger.V(1).Info("validating VM via scheduler evacuation",
Expand Down
Loading