Merge pull request #295 from mrlihanbo/feat/PreferenceBinpack-2

add preference binpack replicas plugin

pkg/controllers/automigration/controller.go

@@ -288,7 +288,7 @@ func (c *Controller) reconcile(ctx context.Context, qualifiedName common.Qualifi
 	// auto-migration controller sets AutoMigrationAnnotation to
 	// feedback auto-migration information back to the scheduler
 
-	var estimatedCapacity map[string]int64
+	var estimatedCapacity, scheduledReplicas map[string]int64
 	var result *worker.Result
 	needsUpdate := false
 	if unschedulableThreshold == nil {
@@ -302,8 +302,8 @@ func (c *Controller) reconcile(ctx context.Context, qualifiedName common.Qualifi
 	} else {
 		// Keep the annotation up-to-date if auto migration is enabled.
 		keyedLogger.V(3).Info("Auto migration is enabled")
-		estimatedCapacity, result = c.estimateCapacity(ctx, ftc, clusterObjs, *unschedulableThreshold)
-		autoMigrationInfo := &framework.AutoMigrationInfo{EstimatedCapacity: estimatedCapacity}
+		estimatedCapacity, scheduledReplicas, result = c.estimateCapacity(ctx, ftc, clusterObjs, *unschedulableThreshold)
+		autoMigrationInfo := &framework.AutoMigrationInfo{EstimatedCapacity: estimatedCapacity, ScheduledReplicas: scheduledReplicas}
 
 		// Compare with the existing autoMigration annotation
 		existingAutoMigrationInfo := &framework.AutoMigrationInfo{EstimatedCapacity: nil}
@@ -366,19 +366,22 @@ func (c *Controller) estimateCapacity(
 	typeConfig *fedcorev1a1.FederatedTypeConfig,
 	clusterObjs []FederatedObject,
 	unschedulableThreshold time.Duration,
-) (map[string]int64, *worker.Result) {
+) (map[string]int64, map[string]int64, *worker.Result) {
 	needsBackoff := false
 	var retryAfter *time.Duration
 
 	estimatedCapacity := make(map[string]int64, len(clusterObjs))
+	scheduledReplicas := make(map[string]int64, len(clusterObjs))
 
 	for _, clusterObj := range clusterObjs {
 		ctx, logger := logging.InjectLoggerValues(ctx, "cluster", clusterObj.ClusterName, "ftc", typeConfig.Name)
 
 		// This is an optimization to skip pod listing when there are no unschedulable pods.
 		totalReplicas, readyReplicas, err := c.getTotalAndReadyReplicas(typeConfig, clusterObj.Object)
 		if err == nil && totalReplicas == readyReplicas {
-			logger.V(3).Info("No unschedulable pods found, skip estimating capacity")
+			logger.V(3).Info("No unschedulable pods found, skip estimating capacity",
+				"readyReplicas", readyReplicas)
+			scheduledReplicas[clusterObj.ClusterName] = totalReplicas
 			continue
 		}
 
@@ -398,13 +401,16 @@ func (c *Controller) estimateCapacity(
 			continue
 		}
 
-		unschedulable, nextCrossIn := countUnschedulablePods(pods, time.Now(), unschedulableThreshold)
+		scheduled, unschedulable, nextCrossIn := countScheduledAndUnschedulablePods(pods, time.Now(), unschedulableThreshold)
 		logger.V(2).Info("Analyzed pods",
 			"total", len(pods),
 			"desired", desiredReplicas,
+			"scheduled", scheduled,
 			"unschedulable", unschedulable,
 		)
 
+		scheduledReplicas[clusterObj.ClusterName] = int64(scheduled)
+
 		if nextCrossIn != nil && (retryAfter == nil || *nextCrossIn < *retryAfter) {
 			retryAfter = nextCrossIn
 		}
@@ -441,7 +447,7 @@ func (c *Controller) estimateCapacity(
 			Backoff:      needsBackoff,
 		}
 	}
-	return estimatedCapacity, result
+	return estimatedCapacity, scheduledReplicas, result
 }
 
 func (c *Controller) getTotalAndReadyReplicas(

pkg/controllers/automigration/util.go

@@ -27,18 +27,21 @@ import (
 // unschedulable for more than unschedulableThreshold,
 // and a time.Duration representing the time from now
 // when the new unschedulable pod will cross the threshold, if any.
-func countUnschedulablePods(
+func countScheduledAndUnschedulablePods(
 	podList []*corev1.Pod,
 	currentTime time.Time,
 	unschedulableThreshold time.Duration,
-) (unschedulableCount int, nextCrossIn *time.Duration) {
+) (scheduledCount, unschedulableCount int, nextCrossIn *time.Duration) {
 	for _, pod := range podList {
 		if pod.GetDeletionTimestamp() != nil {
 			continue
 		}
 
 		scheduledCondition, isUnschedulable := getPodScheduledCondition(pod)
 		if !isUnschedulable {
+			if scheduledCondition != nil && scheduledCondition.Status == corev1.ConditionTrue {
+				scheduledCount++
+			}
 			continue
 		}
 
@@ -51,8 +54,7 @@ func countUnschedulablePods(
 			nextCrossIn = &crossingThresholdIn
 		}
 	}
-
-	return unschedulableCount, nextCrossIn
+	return scheduledCount, unschedulableCount, nextCrossIn
 }
 
 func getPodScheduledCondition(pod *corev1.Pod) (scheduledCondition *corev1.PodCondition, isUnschedulable bool) {

pkg/controllers/automigration/util_test.go

@@ -32,12 +32,14 @@ func doCheck(
 	threshold time.Duration,
 	pods []*corev1.Pod,
 	expectedUnschedulable int,
+	expectedScheduled int,
 	expectedNextCrossIn *time.Duration,
 ) {
 	t.Helper()
 	assert := assert.New(t)
 
-	unschedulableCount, nextCrossIn := countUnschedulablePods(pods, now, threshold)
+	scheduledCount, unschedulableCount, nextCrossIn := countScheduledAndUnschedulablePods(pods, now, threshold)
+	assert.Equal(scheduledCount, expectedScheduled)
 	assert.Equal(expectedUnschedulable, unschedulableCount)
 	assert.Equal(expectedNextCrossIn, nextCrossIn)
 }
@@ -56,26 +58,26 @@ func TestCountUnschedulablePods(t *testing.T) {
 		okPod,
 		okPod,
 		okPod,
-	}, 0, nil)
+	}, 0, 3, nil)
 
 	doCheck(t, now, time.Minute, []*corev1.Pod{
 		okPod,
 		okPod,
 		unschedulablePod,
-	}, 1, nil)
+	}, 1, 2, nil)
 
 	doCheck(t, now, time.Minute, []*corev1.Pod{
 		okPod,
 		okPod,
 		crossingIn10s,
-	}, 0, pointer.Duration(10*time.Second))
+	}, 0, 2, pointer.Duration(10*time.Second))
 
 	doCheck(t, now, time.Minute, []*corev1.Pod{
 		okPod,
 		okPod,
 		unschedulablePod,
 		crossingIn20s,
-	}, 1, pointer.Duration(20*time.Second))
+	}, 1, 2, pointer.Duration(20*time.Second))
 
 	doCheck(t, now, time.Minute, []*corev1.Pod{
 		okPod,
@@ -84,7 +86,7 @@ func TestCountUnschedulablePods(t *testing.T) {
 		unschedulablePod,
 		crossingIn10s,
 		crossingIn20s,
-	}, 2, pointer.Duration(10*time.Second))
+	}, 2, 2, pointer.Duration(10*time.Second))
 
 	doCheck(t, now, time.Minute, []*corev1.Pod{
 		okPod,
@@ -93,7 +95,7 @@ func TestCountUnschedulablePods(t *testing.T) {
 		unschedulableTerminatingPod,
 		crossingIn10s,
 		crossingIn20s,
-	}, 1, pointer.Duration(10*time.Second))
+	}, 1, 2, pointer.Duration(10*time.Second))
 }
 
 func newPod(terminating bool, schedulable bool, lastTransitionTimestamp time.Time) *corev1.Pod {

pkg/controllers/scheduler/framework/plugins/names/names.go

@@ -30,4 +30,5 @@ const (
 	MaxCluster                         = "MaxCluster"
 	ClusterCapacityWeight              = "ClusterCapacityWeight"
 	ClusterEvicted                     = "ClusterEvicted"
+	PreferenceBinPack                  = "PreferenceBinPack"
 )