feat: rename userCreatorEngineTypeLabel

apache · Sep 20, 2023 · 70112a8 · 70112a8
1 parent 186acc0
commit 70112a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/...lication-manager/src/main/java/org/apache/linkis/manager/label/conf/LabelManagerConf.java b/...lication-manager/src/main/java/org/apache/linkis/manager/label/conf/LabelManagerConf.java
@@ -25,5 +25,5 @@ public class LabelManagerConf {
       CommonVars.apply("wds.linkis.label.node.long.lived.label.keys", "tenant").getValue();
 
   public static final boolean COMBINED_WITHOUT_YARN_DEFAULT =
-      CommonVars.apply("wds.linkis.combined.without.yarn.default", true).getValue();
+      CommonVars.apply("linkis.combined.without.yarn.default", true).getValue();
 }
diff --git a/...nager/src/main/java/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.java b/...nager/src/main/java/org/apache/linkis/manager/rm/service/impl/DefaultResourceManager.java
@@ -247,7 +247,7 @@ public ResultResource requestResource(List<Label<?>> labels, NodeResource resour
 
     List<PersistenceLock> persistenceLocks = new ArrayList<>();
     EMInstanceLabel emInstanceLabel = labelContainer.getEMInstanceLabel();
-    CombinedLabel userCreatorEngineTypeLabel = labelContainer.getCombinedResourceLabel();
+    CombinedLabel combinedLabel = labelContainer.getCombinedResourceLabel();
 
     try {
       // check ecm resource if not enough return
@@ -265,14 +265,12 @@ public ResultResource requestResource(List<Label<?>> labels, NodeResource resour
 
       // lock userCreatorEngineTypeLabel
       persistenceLocks.add(
-          tryLockOneLabel(
-              userCreatorEngineTypeLabel, wait, labelContainer.getUserCreatorLabel().getUser()));
+          tryLockOneLabel(combinedLabel, wait, labelContainer.getUserCreatorLabel().getUser()));
       try {
-        labelContainer.setCurrentLabel(userCreatorEngineTypeLabel);
+        labelContainer.setCurrentLabel(combinedLabel);
         if (!requestResourceService.canRequest(labelContainer, resource)) {
           return new NotEnoughResource(
-              String.format(
-                  "Labels:%s not enough resource", userCreatorEngineTypeLabel.getStringValue()));
+              String.format("Labels:%s not enough resource", combinedLabel.getStringValue()));
         }
       } catch (RMWarnException exception) {
         return new NotEnoughResource(exception.getMessage());

diff --git a/...n-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/ResourceLogService.java b/...n-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/ResourceLogService.java
@@ -150,10 +150,10 @@ public void recordUserResourceAction(
     if (RMUtils.RM_RESOURCE_ACTION_RECORD.getValue()) {
       LinkisUtils.tryAndWarn(
           () -> {
-            CombinedLabel userCreatorEngineType = labelContainer.getCombinedResourceLabel();
+            CombinedLabel combinedLabel = labelContainer.getCombinedResourceLabel();
             EngineInstanceLabel engineInstanceLabel = labelContainer.getEngineInstanceLabel();
             EMInstanceLabel eMInstanceLabel = labelContainer.getEMInstanceLabel();
-            if (userCreatorEngineType == null) {
+            if (combinedLabel == null) {
               return;
             }
             ECResourceInfoRecord ecResourceInfoRecord =
@@ -170,11 +170,7 @@ public void recordUserResourceAction(
                       : "";
               ecResourceInfoRecord =
                   new ECResourceInfoRecord(
-                      userCreatorEngineType.getStringValue(),
-                      user,
-                      ticketId,
-                      resource,
-                      logDirSuffix);
+                      combinedLabel.getStringValue(), user, ticketId, resource, logDirSuffix);
               ecResourceRecordMapper.insertECResourceInfoRecord(ecResourceInfoRecord);
             }
             if (engineInstanceLabel != null) {