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

koord-manager: fix quota profile resource ratio #1679

Merged
merged 1 commit into from
Sep 22, 2023
+35 −33
Merged

koord-manager: fix quota profile resource ratio #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 32 additions & 30 deletions pkg/quota-controller/profile/profile_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,6 @@ func (r *QuotaProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
}

selector, err := metav1.LabelSelectorAsSelector(profile.Spec.NodeSelector)
if err != nil {
klog.Errorf("failed to convert profile %v nodeSelector, error: %v", req.NamespacedName, err)
return ctrl.Result{Requeue: true, RequeueAfter: 10 * time.Second}, err
}
nodeList := &corev1.NodeList{}
if err := r.Client.List(context.TODO(), nodeList, &client.ListOptions{LabelSelector: selector}, utilclient.DisableDeepCopy); err != nil {
return ctrl.Result{Requeue: true}, err
}

// TODO: consider node status.
totalResource := corev1.ResourceList{}
for _, node := range nodeList.Items {
totalResource = quotav1.Add(totalResource, node.Status.Allocatable)
}

quotaExist := true
quota := &schedv1alpha1.ElasticQuota{}
err = r.Client.Get(context.TODO(), types.NamespacedName{Namespace: profile.Namespace, Name: profile.Spec.QuotaName}, quota)
Expand All @@ -132,13 +116,20 @@ func (r *QuotaProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
oldQuota := quota.DeepCopy()

resourceKeys := []string{"cpu", "memory"}
raw, ok := profile.Annotations[extension.AnnotationResourceKeys]
if ok {
err := json.Unmarshal([]byte(raw), &resourceKeys)
if err != nil {
klog.Warningf("failed unmarshal quota.scheduling.koordinator.sh/resource-keys %v", raw)
}
selector, err := metav1.LabelSelectorAsSelector(profile.Spec.NodeSelector)
if err != nil {
klog.Errorf("failed to convert profile %v nodeSelector, error: %v", req.NamespacedName, err)
return ctrl.Result{Requeue: true, RequeueAfter: 10 * time.Second}, err
}
nodeList := &corev1.NodeList{}
if err := r.Client.List(context.TODO(), nodeList, &client.ListOptions{LabelSelector: selector}, utilclient.DisableDeepCopy); err != nil {
return ctrl.Result{Requeue: true}, err
}

// TODO: consider node status.
totalResource := corev1.ResourceList{}
for _, node := range nodeList.Items {
totalResource = quotav1.Add(totalResource, node.Status.Allocatable)
}

ratio := 1.0
Expand All @@ -149,18 +140,29 @@ func (r *QuotaProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
}

for resourceName, quantity := range totalResource {
totalResource[resourceName] = MultiplyQuantity(quantity, resourceName, ratio)
}

resourceKeys := []string{"cpu", "memory"}
raw, ok := profile.Annotations[extension.AnnotationResourceKeys]
if ok {
err := json.Unmarshal([]byte(raw), &resourceKeys)
if err != nil {
klog.Warningf("failed unmarshal quota.scheduling.koordinator.sh/resource-keys %v", raw)
}
}

min := corev1.ResourceList{}
max := corev1.ResourceList{}
for _, key := range resourceKeys {
resourceName := corev1.ResourceName(key)
quantity, ok := totalResource[resourceName]
if !ok {
continue
quantity = *resource.NewQuantity(0, resource.DecimalSI)
}
value := MultiplyQuantity(quantity, resourceName, ratio)

min[resourceName] = value
totalResource[resourceName] = value
min[resourceName] = quantity
max[resourceName] = *resource.NewQuantity(math.MaxInt64/5, resource.DecimalSI)
}

Expand Down Expand Up @@ -200,20 +202,20 @@ func (r *QuotaProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request
if err != nil {
r.Recorder.Eventf(profile, "Warning", ReasonCreateQuotaFailed, "failed to create quota, err: %s", err)
klog.Errorf("failed create quota for profile %v, error: %v", req.NamespacedName, err)
return ctrl.Result{Requeue: true}, err
return ctrl.Result{RequeueAfter: 2 * time.Second}, nil
}
} else {
if !reflect.DeepEqual(quota.Labels, oldQuota.Labels) || !reflect.DeepEqual(quota.Annotations, oldQuota.Annotations) || !reflect.DeepEqual(quota.Spec, oldQuota.Spec) {
err = r.Client.Update(context.TODO(), quota)
if err != nil {
r.Recorder.Eventf(profile, "Warning", ReasonUpdateQuotaFailed, "failed to update quota, err: %s", err)
klog.Errorf("failed update quota for profile %v, error: %v", req.NamespacedName, err)
return ctrl.Result{Requeue: true}, err
return ctrl.Result{RequeueAfter: 2 * time.Second}, nil
}
}
}

return ctrl.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil
return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
}

func Add(mgr ctrl.Manager) error {
Expand Down
6 changes: 3 additions & 3 deletions pkg/quota-controller/profile/profile_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func TestQuotaProfileReconciler_Reconciler_CreateQuota(t *testing.T) {
},
oriQuota: nil,
expectQuotaMin: createResourceList(18, 1800),
expectTotalResource: createResourceListWithStorage(18, 1800, 2000),
expectTotalResource: createResourceListWithStorage(18, 1800, 1800),
expectQuotaLabels: map[string]string{
extension.LabelQuotaProfile: "profile1",
extension.LabelQuotaTreeID: treeID1,
Expand All @@ -241,7 +241,7 @@ func TestQuotaProfileReconciler_Reconciler_CreateQuota(t *testing.T) {
},
oriQuota: nil,
expectQuotaMin: createResourceList(18, 1800),
expectTotalResource: createResourceListWithStorage(18, 1800, 2000),
expectTotalResource: createResourceListWithStorage(18, 1800, 1800),
expectQuotaLabels: map[string]string{
extension.LabelQuotaProfile: "profile1",
extension.LabelQuotaTreeID: "tree1",
Expand Down Expand Up @@ -270,7 +270,7 @@ func TestQuotaProfileReconciler_Reconciler_CreateQuota(t *testing.T) {
},
oriQuota: nil,
expectQuotaMin: corev1.ResourceList{corev1.ResourceCPU: *resource.NewMilliQuantity(18*1000, resource.DecimalSI)},
expectTotalResource: createResourceListWithStorage(18, 2000, 2000),
expectTotalResource: createResourceListWithStorage(18, 1800, 1800),
expectQuotaLabels: map[string]string{
extension.LabelQuotaProfile: "profile1",
extension.LabelQuotaTreeID: "tree1",
Expand Down