Fix build issue
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala
index 48f375e..685c976 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala
@@ -17,12 +17,12 @@
package org.apache.linkis.entrance.scheduler
-import org.apache.linkis.common.utils.Utils
+import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.entrance.conf.EntranceConfiguration
import org.apache.linkis.entrance.job.EntranceExecutionJob
import org.apache.linkis.entrance.utils.JobHistoryHelper
import org.apache.linkis.scheduler.SchedulerContext
-import org.apache.linkis.scheduler.queue.{Consumer, Group}
+import org.apache.linkis.scheduler.queue.Group
import org.apache.linkis.scheduler.queue.fifoqueue.FIFOUserConsumer
import java.util
@@ -34,7 +34,8 @@
schedulerContext: SchedulerContext,
executeService: ExecutorService,
private var group: Group
-) extends FIFOUserConsumer(schedulerContext, executeService, group) {
+) extends FIFOUserConsumer(schedulerContext, executeService, group)
+ with Logging {
override def loop(): Unit = {
// When offlineFlag=true, the unsubmitted tasks will be failover, and the running tasks will wait for completion.
@@ -83,12 +84,13 @@
val ecType = groupNames(length - 1)
for (consumer <- consumers) {
val groupName = consumer.getGroup.getGroupName
- if (groupName.startsWith(creatorName) && groupName.endsWith(ecType))
+ if (groupName.startsWith(creatorName) && groupName.endsWith(ecType)) {
creatorRunningJobNum += consumer.getRunningEvents.length
+ }
}
val creatorECTypeMaxRunningJobs =
CreatorECTypeDefaultConf.getCreatorECTypeMaxRunningJobs(creatorName, ecType)
- if (logger.isDebugEnabled)
+ if (logger.isDebugEnabled) {
logger.debug(
"Creator: {} EC: {} there are currently:{} jobs running and maximum limit: {}",
creatorName,
@@ -96,6 +98,7 @@
creatorRunningJobNum,
creatorECTypeMaxRunningJobs
)
+ }
if (creatorRunningJobNum > creatorECTypeMaxRunningJobs) {
logger.error(
"Creator: {} EC: {} there are currently:{} jobs running that exceed the maximum limit: {}",
diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/constant/LabelKeyConstant.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/constant/LabelKeyConstant.java
index 8021b35..fbaea61 100644
--- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/constant/LabelKeyConstant.java
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/constant/LabelKeyConstant.java
@@ -66,5 +66,9 @@
public static final String ENGINGE_CONN_RUNTIME_MODE_KEY = "engingeConnRuntimeMode";
+ public static final String TEMPLATE_CONF_KEY = "ec.conf.templateId";
+
+ public static final String TEMPLATE_CONF_NAME_KEY = "ec.resource.name";
+
public static final String MANAGER_KEY = "manager";
}
