From 4460d3efdc3f90efa16893f8218ffffbe78089a2 Mon Sep 17 00:00:00 2001 From: KunWuLuan Date: Wed, 15 May 2024 20:26:24 +0800 Subject: [PATCH] remove the debugLogger Signed-off-by: KunWuLuan --- .../api/rest/running_workloads_cq.go | 7 --- .../api/rest/running_workloads_cq_test.go | 54 +++++++++++++++++++ pkg/visibility/api/rest/utils.go | 6 ++- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/pkg/visibility/api/rest/running_workloads_cq.go b/pkg/visibility/api/rest/running_workloads_cq.go index 6fd09edf7d..dc9a635845 100644 --- a/pkg/visibility/api/rest/running_workloads_cq.go +++ b/pkg/visibility/api/rest/running_workloads_cq.go @@ -54,14 +54,9 @@ func (m *runningWorkloadsInCqREST) New() runtime.Object { // Destroy implements rest.Storage interface func (m *runningWorkloadsInCqREST) Destroy() {} -var ( - debugLog = ctrl.Log.WithName("visibility-server") -) - // Get implements rest.GetterWithOptions interface // It fetches information about running workloads and returns according to query params func (m *runningWorkloadsInCqREST) Get(ctx context.Context, name string, opts runtime.Object) (runtime.Object, error) { - debugLog.V(1).Info("got a request") runningWorkloadOpts, ok := opts.(*v1alpha1.RunningWorkloadOptions) if !ok { return nil, fmt.Errorf("invalid options object: %#v", opts) @@ -71,7 +66,6 @@ func (m *runningWorkloadsInCqREST) Get(ctx context.Context, name string, opts ru wls := make([]v1alpha1.RunningWorkload, 0, limit) runningWorkloadsInfo, err := m.c.RunningWorkload(name) - debugLog.V(1).Info("got runningWorkloads", "len", len(runningWorkloadsInfo)) if err != nil { return nil, err } @@ -80,7 +74,6 @@ func (m *runningWorkloadsInCqREST) Get(ctx context.Context, name string, opts ru wlInfo := runningWorkloadsInfo[index] wls = append(wls, *newRunningWorkload(wlInfo)) } - debugLog.V(1).Info("response", "len", len(wls)) return &v1alpha1.RunningWorkloadsSummary{Items: wls}, nil } diff --git a/pkg/visibility/api/rest/running_workloads_cq_test.go b/pkg/visibility/api/rest/running_workloads_cq_test.go index 63f2f08212..4136091481 100644 --- a/pkg/visibility/api/rest/running_workloads_cq_test.go +++ b/pkg/visibility/api/rest/running_workloads_cq_test.go @@ -175,6 +175,60 @@ func TestRunningWorkloadsInCQ(t *testing.T) { }}, }, }, + "single ClusterQueue and two LocalQueue setup with four running workloads and two pending workloads and default query parameters": { + clusterQueues: []*kueue.ClusterQueue{ + utiltesting.MakeClusterQueue(cqNameA).ResourceGroup(*q1).Obj(), + }, + workloads: []*kueue.Workload{ + utiltesting.MakeWorkload("lqA-1", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameA).Creation(now).Admitted(true).Obj(), + utiltesting.MakeWorkload("lqA-2", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameA).Creation(now).Admitted(true).Obj(), + utiltesting.MakeWorkload("lqB-1", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameB).Creation(now.Add(time.Second)).Admitted(true).Obj(), + utiltesting.MakeWorkload("lqB-2", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameB).Creation(now.Add(time.Second)).Admitted(true).Obj(), + utiltesting.MakeWorkload("lqA-pending", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameA).Creation(now.Add(time.Second * 2)).Obj(), + utiltesting.MakeWorkload("lqB-pending", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameB).Creation(now.Add(time.Second * 2)).Obj(), + utiltesting.MakeWorkload("lqA-finished", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameA).Creation(now.Add(time.Second * 2)).Finished().Obj(), + utiltesting.MakeWorkload("lqB-finished", nsName).PodSets(podSets...).ReserveQuota(adA).Queue(lqNameB).Creation(now.Add(time.Second * 2)).Finished().Obj(), + }, + req: &runningReq{ + queueName: cqNameA, + queryParams: defaultQueryParams, + }, + wantResp: &runningResp{ + wantRunningWorkloads: []visibility.RunningWorkload{ + { + ObjectMeta: v1.ObjectMeta{ + Name: "lqA-1", + Namespace: nsName, + CreationTimestamp: v1.NewTime(now), + }, + Priority: 0, + }, + { + ObjectMeta: v1.ObjectMeta{ + Name: "lqB-1", + Namespace: nsName, + CreationTimestamp: v1.NewTime(now.Add(time.Second)), + }, + Priority: 0, + }, + { + ObjectMeta: v1.ObjectMeta{ + Name: "lqA-2", + Namespace: nsName, + CreationTimestamp: v1.NewTime(now), + }, + Priority: 0, + }, + { + ObjectMeta: v1.ObjectMeta{ + Name: "lqB-2", + Namespace: nsName, + CreationTimestamp: v1.NewTime(now.Add(time.Second)), + }, + Priority: 0, + }}, + }, + }, "limit query parameter set": { clusterQueues: []*kueue.ClusterQueue{ utiltesting.MakeClusterQueue(cqNameA).ResourceGroup(*q1).Obj(), diff --git a/pkg/visibility/api/rest/utils.go b/pkg/visibility/api/rest/utils.go index 5922cfa415..386a193897 100644 --- a/pkg/visibility/api/rest/utils.go +++ b/pkg/visibility/api/rest/utils.go @@ -60,6 +60,10 @@ func newRunningWorkload(wlInfo *workload.Info) *v1alpha1.RunningWorkload { // this should never happen return nil } + var priority int32 = 0 + if wlInfo.Obj.Spec.Priority != nil { + priority = *wlInfo.Obj.Spec.Priority + } return &v1alpha1.RunningWorkload{ ObjectMeta: metav1.ObjectMeta{ Name: wlInfo.Obj.Name, @@ -67,7 +71,7 @@ func newRunningWorkload(wlInfo *workload.Info) *v1alpha1.RunningWorkload { OwnerReferences: ownerReferences, CreationTimestamp: wlInfo.Obj.CreationTimestamp, }, - Priority: *wlInfo.Obj.Spec.Priority, + Priority: priority, AdmissionTime: metav1.NewTime(admittedTime), } }