[incubator-linkis] branch dev-1.1.1 updated: Fix Resource check does not check ECM's resources #1929 (#1930)

[ca...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

casion pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
     new 6e74c3299 Fix Resource check does not check ECM's resources #1929 (#1930)
6e74c3299 is described below

commit 6e74c3299e608172dae6cda5f842a80af18cdebe
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Apr 8 22:42:24 2022 +0800

    Fix Resource check does not check ECM's resources #1929 (#1930)
---
 .../linkis/resourcemanager/service/impl/DefaultResourceManager.scala     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
index fe46db6c9..c2644c64e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
@@ -222,6 +222,7 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
       labelContainer.getResourceLabels.foreach(label => {
         //check all resource of label
         Utils.tryCatch {
+          labelContainer.setCurrentLabel(label)
           if (!requestResourceService.canRequest(labelContainer, resource)) {
             return NotEnoughResource(s"Labels:${label.getStringValue} not enough resource")
           }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org