move release code up in call stack

Author: asm582

pkg/controller/queuejob/queuejob_controller_ex.go

@@ -1025,6 +1025,8 @@ func (qjm *XController) chooseAgent(qj *arbv1.AppWrapper) string {
 		//Now evaluate quota
 		if qjm.serverOption.QuotaEnabled {
 			if qjm.quotaManager != nil {
+				//quota trees faile to update with AW deletes, release quota before assigning
+				qjm.quotaManager.Release(qj)
 				if fits, preemptAWs, _ := qjm.quotaManager.Fits(qj, qjAggrResources, proposedPreemptions); fits {
 					klog.V(2).Infof("[chooseAgent] AppWrapper %s has enough quota.\n", qj.Name)
 					qjm.preemptAWJobs(preemptAWs)
@@ -1256,6 +1258,8 @@ func (qjm *XController) ScheduleNext() {
 				klog.V(10).Infof("[ScheduleNext] HOL available resourse successful check for %s at %s activeQ=%t Unsched=%t &qj=%p Version=%s Status=%+v due to quota limits", qj.Name, time.Now().Sub(HOLStartTime), qjm.qjqueue.IfExistActiveQ(qj), qjm.qjqueue.IfExistUnschedulableQ(qj), qj, qj.ResourceVersion, qj.Status)
 				if qjm.serverOption.QuotaEnabled {
 					if qjm.quotaManager != nil {
+						//quota trees faile to update with AW deletes, release quota before assigning
+						qjm.quotaManager.Release(qj)
 						quotaFits, preemptAWs, msg := qjm.quotaManager.Fits(qj, aggqj, proposedPreemptions)
 						if quotaFits {
 							klog.V(4).Infof("[ScheduleNext] HOL quota evaluation successful %s for %s activeQ=%t Unsched=%t &qj=%p Version=%s Status=%+v due to quota limits", qj.Name, time.Now().Sub(HOLStartTime), qjm.qjqueue.IfExistActiveQ(qj), qjm.qjqueue.IfExistUnschedulableQ(qj), qj, qj.ResourceVersion, qj.Status)

pkg/quotaplugins/quota-forest/quota-manager/quota/quotamanager.go

@@ -21,12 +21,8 @@ import (
 	"fmt"
 	"strings"
 
-	clientset "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/quota-forest/quota-manager/quota/core"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/quota-forest/quota-manager/quota/utils"
-	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/util"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 )
 
@@ -376,34 +372,9 @@ func (m *Manager) AllocateForest(forestName string, consumerID string) (response
 	if consumerInfo == nil {
 		return nil, fmt.Errorf("consumer %s does not exist, create and add first", consumerID)
 	}
-	//allocation can pass if consumers inside the forest are not released
-	//make sure that appwrapper (consumer) does not exist in target namespace
-	namespace, awName := util.ParseId(consumerID)
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		klog.Errorf("unable to retrieve in-cluster kubeconfig %v", err)
-	}
-	arbclients := clientset.NewForConfigOrDie(config)
-	awQueried, err := arbclients.ArbV1().AppWrappers(namespace).Get(awName, v1.GetOptions{})
-	var awExistsInNamespace bool = false
-	if err != nil {
-		klog.Errorf("Unable to query consumer %v,", consumerID)
-		//force set to true
-		awExistsInNamespace = true
-	}
-	if awQueried.Name == awName {
-		awExistsInNamespace = true
-		klog.V(5).Infof("[AllocateForest] Found consumer %v in namespace", consumerID)
-	}
-	if awExistsInNamespace {
-		if forestController.IsConsumerAllocated(consumerID) {
-			return nil, fmt.Errorf("consumer %s already allocated on forest %s", consumerID, forestName)
-		}
-	} else {
-		if forestController.IsConsumerAllocated(consumerID) {
-			klog.V(4).Infof("[AllocateForest] Found consumer %v in quota tree but didn't find its matching AppWrapper. Deleting consumer from the tree", consumerID)
-			m.DeAllocateForest(forestName, consumerID)
-		}
+
+	if forestController.IsConsumerAllocated(consumerID) {
+		return nil, fmt.Errorf("consumer %s already allocated on forest %s", consumerID, forestName)
 	}
 
 	resourceNames := forestController.GetResourceNames()