add creator task running number limit

WeDataSphere · Nov 27, 2023 · 9ed39ef · 9ed39ef
1 parent 39081ed
commit 9ed39ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...trance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala b/...trance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala
@@ -92,20 +92,12 @@ class EntranceFIFOUserConsumer(
       CreatorECTypeDefaultConf.getCreatorECTypeMaxRunningJobs(creatorName, ecType)
     if (logger.isDebugEnabled) {
       logger.debug(
-        "Creator: {} EC: {} there are currently:{} jobs running and maximum limit: {}",
-        creatorName,
-        ecType,
-        creatorRunningJobNum,
-        creatorECTypeMaxRunningJobs
+        s"Creator: $creatorName EC:$ecType there are currently:$creatorRunningJobNum jobs running and maximum limit: $creatorECTypeMaxRunningJobs"
       )
     }
     if (creatorRunningJobNum > creatorECTypeMaxRunningJobs) {
       logger.error(
-        "Creator: {} EC: {} there are currently:{} jobs running that exceed the maximum limit: {}",
-        creatorName,
-        ecType,
-        creatorRunningJobNum,
-        creatorECTypeMaxRunningJobs
+        s"Creator: $creatorName EC:$ecType there are currently:$creatorRunningJobNum  jobs running that exceed the maximum limit: $creatorECTypeMaxRunningJobs"
       )
       false
     } else true

diff --git a/...src/main/scala/org/apache/linkis/entrance/scheduler/EntranceParallelConsumerManager.scala b/...src/main/scala/org/apache/linkis/entrance/scheduler/EntranceParallelConsumerManager.scala
@@ -45,8 +45,8 @@ class EntranceParallelConsumerManager(maxParallelismUsers: Int, schedulerName: S
 
   if (EntranceConfiguration.ENTRANCE_GROUP_SCAN_ENABLED.getValue) {
     Utils.defaultScheduler.scheduleAtFixedRate(
-      () => {
-        Utils.tryAndError {
+      new Runnable {
+        override def run(): Unit = Utils.tryAndWarn {
           // refresh all group maxAllowRunningJobs
           refreshAllGroupMaxAllowRunningJobs(EntranceUtils.getRunningEntranceNumber())
           logger.info("Finished to refresh consumer group maxAllowRunningJobs")