add debug info for event-handler clusteraffinities

Signed-off-by: changzhen <[email protected]>
karmada-io · May 18, 2023 · 421cb78 · 421cb78
1 parent 64d8845
commit 421cb78
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
         # Here support the latest three minor releases of Kubernetes, this can be considered to be roughly
         # the same as the End of Life of the Kubernetes release: https://kubernetes.io/releases/
         # Please remember to update the CI Schedule Workflow when we add a new version.
-        k8s: [ v1.24.2, v1.25.0, v1.26.0 ]
+        k8s: [ v1.24.1, v1.24.2, v1.25.0, v1.25.1, v1.26.0 ]
     steps:
       - name: checkout code
         uses: actions/checkout@v3

diff --git a/pkg/scheduler/event_handler.go b/pkg/scheduler/event_handler.go
@@ -251,6 +251,16 @@ func (s *Scheduler) enqueueAffectedBindings(cluster *clusterv1alpha1.Cluster) er
 			continue
 		}
 
+		if placementPtr.ClusterAffinities != nil {
+			klog.InfoS("Debug event_handler: RB",
+				"Namespace", binding.Namespace,
+				"Name", binding.Name,
+				"SchedulerObservedGeneration", binding.Status.SchedulerObservedGeneration,
+				"Generation", binding.Generation,
+				"ClusterAffinities", placementPtr.ClusterAffinities,
+				"SchedulerObservedAffinityName", binding.Status.SchedulerObservedAffinityName)
+		}
+
 		var affinity *policyv1alpha1.ClusterAffinity
 		if placementPtr.ClusterAffinities != nil {
 			if binding.Status.SchedulerObservedGeneration != binding.Generation {
@@ -292,6 +302,15 @@ func (s *Scheduler) enqueueAffectedCRBs(cluster *clusterv1alpha1.Cluster) error
 			continue
 		}
 
+		if placementPtr.ClusterAffinities != nil {
+			klog.InfoS("Debug event_handler: CRB",
+				"Name", binding.Name,
+				"SchedulerObservedGeneration", binding.Status.SchedulerObservedGeneration,
+				"Generation", binding.Generation,
+				"ClusterAffinities", placementPtr.ClusterAffinities,
+				"SchedulerObservedAffinityName", binding.Status.SchedulerObservedAffinityName)
+		}
+
 		var affinity *policyv1alpha1.ClusterAffinity
 		if placementPtr.ClusterAffinities != nil {
 			if binding.Status.SchedulerObservedGeneration != binding.Generation {

diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -310,6 +310,14 @@ func (s *Scheduler) doScheduleBinding(namespace, name string) (err error) {
 	}
 	rb = rb.DeepCopy()
 
+	klog.InfoS("Debug doScheduleBinding: RB",
+		"Namespace", rb.Namespace,
+		"Name", rb.Name,
+		"SchedulerObservedGeneration", rb.Status.SchedulerObservedGeneration,
+		"Generation", rb.Generation,
+		"ClusterAffinities", rb.Spec.Placement.ClusterAffinities,
+		"SchedulerObservedAffinityName", rb.Status.SchedulerObservedAffinityName)
+
 	if rb.Spec.Placement == nil {
 		// never reach here
 		err = fmt.Errorf("failed to get placement from resourceBinding(%s/%s)", rb.Namespace, rb.Name)
@@ -428,6 +436,15 @@ func (s *Scheduler) scheduleResourceBinding(rb *workv1alpha2.ResourceBinding) (e
 				err = updateErr
 			}
 		}
+
+		newRB, _ := s.bindingLister.ResourceBindings(rb.Namespace).Get(rb.Name)
+		klog.InfoS("Debug after patchBindingStatusCondition: RB",
+			"Namespace", newRB.Namespace,
+			"Name", newRB.Name,
+			"SchedulerObservedGeneration", newRB.Status.SchedulerObservedGeneration,
+			"Generation", newRB.Generation,
+			"ClusterAffinities", newRB.Spec.Placement.ClusterAffinities,
+			"SchedulerObservedAffinityName", newRB.Status.SchedulerObservedAffinityName)
 	}()
 
 	if rb.Spec.Placement.ClusterAffinities != nil {
@@ -542,11 +559,11 @@ func (s *Scheduler) patchScheduleResultForResourceBinding(oldBinding *workv1alph
 
 	_, err = s.KarmadaClient.WorkV1alpha2().ResourceBindings(newBinding.Namespace).Patch(context.TODO(), newBinding.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
 	if err != nil {
-		klog.Errorf("Failed to patch schedule to ResourceBinding(%s/%s): %v", oldBinding.Namespace, oldBinding.Name, err)
+		klog.Errorf("Failed to patch schedule result to ResourceBinding(%s/%s): %v", oldBinding.Namespace, oldBinding.Name, err)
 		return err
 	}
 
-	klog.V(4).Infof("Patch schedule to ResourceBinding(%s/%s) succeed", oldBinding.Namespace, oldBinding.Name)
+	klog.V(4).Infof("Patch schedule result to ResourceBinding(%s/%s) succeed", oldBinding.Namespace, oldBinding.Name)
 	return nil
 }
 
@@ -738,6 +755,14 @@ func (s *Scheduler) establishEstimatorConnections() {
 func patchBindingStatusCondition(karmadaClient karmadaclientset.Interface, rb *workv1alpha2.ResourceBinding, newScheduledCondition metav1.Condition) error {
 	klog.V(4).Infof("Begin to patch status condition to ResourceBinding(%s/%s)", rb.Namespace, rb.Name)
 
+	klog.InfoS("Debug before patchBindingStatusCondition: RB",
+		"Namespace", rb.Namespace,
+		"Name", rb.Name,
+		"SchedulerObservedGeneration", rb.Status.SchedulerObservedGeneration,
+		"Generation", rb.Generation,
+		"ClusterAffinities", rb.Spec.Placement.ClusterAffinities,
+		"SchedulerObservedAffinityName", rb.Status.SchedulerObservedAffinityName)
+
 	updateRB := rb.DeepCopy()
 	meta.SetStatusCondition(&updateRB.Status.Conditions, newScheduledCondition)
 	// Postpone setting observed generation until schedule succeed, assume scheduler will retry and
@@ -780,6 +805,15 @@ func patchBindingStatus(karmadaClient karmadaclientset.Interface, rb, updateRB *
 	}
 
 	klog.V(4).Infof("Patch schedule status to ResourceBinding(%s/%s) succeed", rb.Namespace, rb.Name)
+
+	klog.InfoS("Debug after patchBindingStatus: RB",
+		"Namespace", rb.Namespace,
+		"Name", rb.Name,
+		"SchedulerObservedGeneration", rb.Status.SchedulerObservedGeneration,
+		"Generation", rb.Generation,
+		"ClusterAffinities", rb.Spec.Placement.ClusterAffinities,
+		"SchedulerObservedAffinityName", rb.Status.SchedulerObservedAffinityName)
+
 	return nil
 }