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

Serialization support for FlavorResource, FlavorResourceSet and FlavorResourceQuantities #4420

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −2
Open

Serialization support for FlavorResource, FlavorResourceSet and FlavorResourceQuantities #4420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd1261a
Make FlavorResource and FlavorResourceQuantities serializable
nasedil Feb 26, 2025
1cfd389
Add serializable FlavorResourceSet wrapper
nasedil Feb 26, 2025
64eed78
Refactor logging code by removing redudant serializers
nasedil Feb 27, 2025
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: 18 additions & 0 deletions pkg/resources/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package resources

import (
"encoding/json"

corev1 "k8s.io/api/core/v1"

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
Expand All @@ -27,4 +29,20 @@ type FlavorResource struct {
Resource corev1.ResourceName
}

func (fr FlavorResource) MarshalJSON() ([]byte, error) {
return json.Marshal(string(fr.Flavor) + " - " + string(fr.Resource))
}

type FlavorResourceQuantities map[FlavorResource]int64

func (q FlavorResourceQuantities) MarshalJSON() ([]byte, error) {
temp := make(map[string]int64)
for flavourResource, num := range q {
keyJSON, err := json.Marshal(flavourResource)
if err != nil {
return nil, err
}
temp[string(keyJSON)] = num
}
return json.Marshal(temp)
}
4 changes: 2 additions & 2 deletions pkg/scheduler/preemption/preemption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func (p *Preemptor) applyPreemptionWithSSA(ctx context.Context, w *kueue.Workloa
// fits.
func minimalPreemptions(preemptionCtx *preemptionCtx, candidates []*workload.Info, allowBorrowing bool, allowBorrowingBelowPriority *int32) []*Target {
if logV := preemptionCtx.log.V(5); logV.Enabled() {
logV.Info("Simulating preemption", "candidates", workload.References(candidates), "resourcesRequiringPreemption", preemptionCtx.frsNeedPreemption, "allowBorrowing", allowBorrowing, "allowBorrowingBelowPriority", allowBorrowingBelowPriority, "preemptingWorkload", klog.KObj(preemptionCtx.preemptor.Obj))
logV.Info("Simulating preemption", "candidates", workload.References(candidates), "resourcesRequiringPreemption", preemptionCtx.frsNeedPreemption.UnsortedList(), "allowBorrowing", allowBorrowing, "allowBorrowingBelowPriority", allowBorrowingBelowPriority, "preemptingWorkload", klog.KObj(preemptionCtx.preemptor.Obj))
}
// Simulate removing all candidates from the ClusterQueue and cohort.
var targets []*Target
Expand Down Expand Up @@ -359,7 +359,7 @@ func parseStrategies(s []config.PreemptionStrategy) []fsStrategy {

func (p *Preemptor) fairPreemptions(preemptionCtx *preemptionCtx, candidates []*workload.Info, allowBorrowingBelowPriority *int32) []*Target {
if logV := preemptionCtx.log.V(5); logV.Enabled() {
logV.Info("Simulating fair preemption", "candidates", workload.References(candidates), "resourcesRequiringPreemption", preemptionCtx.frsNeedPreemption, "allowBorrowingBelowPriority", allowBorrowingBelowPriority, "preemptingWorkload", klog.KObj(preemptionCtx.preemptor.Obj))
logV.Info("Simulating fair preemption", "candidates", workload.References(candidates), "resourcesRequiringPreemption", preemptionCtx.frsNeedPreemption.UnsortedList(), "allowBorrowingBelowPriority", allowBorrowingBelowPriority, "preemptingWorkload", klog.KObj(preemptionCtx.preemptor.Obj))
}
requests := preemptionCtx.requests
cqHeap := cqHeapFromCandidates(candidates, false, preemptionCtx.snapshot)
Expand Down