diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala index 4bdeca1f25..a55922d03e 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala @@ -466,7 +466,8 @@ object EntranceConfiguration { */ val HIVE_LOCATION_CONTROL_WHITELIST_CREATORS: CommonVars[String] = CommonVars("wds.linkis.hive.location.control.whitelist.creators", "") - * Entrance Group缓存清理功能总开关 + + /** Entrance Group缓存清理功能总开关 * * 控制以下功能是否启用: * 1. Entrance offline时发送Group缓存清理广播 2. 接收并处理Group缓存清理广播 3. 手动清理Group缓存API diff --git a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/util/YarnUtil.scala b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/util/YarnUtil.scala index 30ecb417c1..7f664a3527 100644 --- a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/util/YarnUtil.scala +++ b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/util/YarnUtil.scala @@ -18,7 +18,7 @@ package org.apache.linkis.engineconnplugin.flink.util import org.apache.linkis.common.exception.ErrorException -import org.apache.linkis.common.utils.Logging +import org.apache.linkis.common.utils.{ByteTimeUtils, Logging} import org.apache.linkis.engineconn.core.executor.ExecutorManager import org.apache.linkis.engineconn.executor.entity.YarnExecutor import org.apache.linkis.engineconnplugin.flink.client.config.FlinkVersionThreadLocal @@ -28,7 +28,6 @@ import org.apache.linkis.engineconnplugin.flink.config.FlinkEnvConfiguration import org.apache.linkis.governance.common.conf.GovernanceCommonConf import org.apache.linkis.governance.common.constant.ec.ECConstants import org.apache.linkis.manager.common.entity.enumeration.NodeStatus - import org.apache.commons.lang3.StringUtils import org.apache.flink import org.apache.flink.client.program.rest.RestClusterClient @@ -36,18 +35,12 @@ import org.apache.flink.configuration.{HighAvailabilityOptions, JobManagerOption import org.apache.flink.runtime.client.JobStatusMessage import org.apache.flink.yarn.configuration.YarnConfigOptions import org.apache.hadoop.conf.Configuration -import org.apache.hadoop.yarn.api.records.{ - ApplicationId, - ApplicationReport, - FinalApplicationStatus, - YarnApplicationState -} +import org.apache.hadoop.yarn.api.records.{ApplicationId, ApplicationReport, FinalApplicationStatus, YarnApplicationState} import org.apache.hadoop.yarn.client.api.YarnClient import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.hadoop.yarn.util.ConverterUtils import java.util - import scala.collection.JavaConverters.collectionAsScalaIterableConverter import scala.collection.mutable.ArrayBuffer