remove the debugLogger

Signed-off-by: KunWuLuan <kunwuluan@gmail.com>
kubernetes-sigs · May 15, 2024 · 4460d3e · 4460d3e
1 parent b17c351
commit 4460d3e
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 8 deletions.
diff --git 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
@@ -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
@@ -60,14 +60,18 @@ 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,
 			Namespace:         wlInfo.Obj.Namespace,
 			OwnerReferences:   ownerReferences,
 			CreationTimestamp: wlInfo.Obj.CreationTimestamp,
 		},
-		Priority:      *wlInfo.Obj.Spec.Priority,
+		Priority:      priority,
 		AdmissionTime: metav1.NewTime(admittedTime),
 	}
 }