You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/03 05:51:58 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: scala code format alarm clear in linkis-engineconn-manager-server (#3211)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 55afd5856 feat: scala code format alarm clear in linkis-engineconn-manager-server (#3211)
55afd5856 is described below
commit 55afd585664f603f1197255cc13215e7a82ae102
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Sat Sep 3 13:51:52 2022 +0800
feat: scala code format alarm clear in linkis-engineconn-manager-server (#3211)
* feat: scala code format alarm clear in linkis-engineconn-manager-server
---
.../linkis/ecm/server/engineConn/DefaultEngineConn.scala | 2 +-
.../main/scala/org/apache/linkis/ecm/server/hook/ECMHook.scala | 2 +-
.../apache/linkis/ecm/server/metrics/DefaultECMMetrics.scala | 4 ++--
.../linkis/ecm/server/operator/EngineConnYarnLogOperator.scala | 3 +--
.../ecm/server/service/impl/DefaultECMMetricsService.scala | 2 +-
.../ecm/server/service/impl/DefaultECMRegisterService.scala | 4 ++--
.../ecm/server/service/impl/DefaultEngineConnListService.scala | 10 +++++++---
.../scala/org/apache/linkis/ecm/server/util/ECMUtils.scala | 8 ++++----
8 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/engineConn/DefaultEngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/engineConn/DefaultEngineConn.scala
index 0a0f35162..3ad77c6be 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/engineConn/DefaultEngineConn.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/engineConn/DefaultEngineConn.scala
@@ -99,5 +99,5 @@ class DefaultEngineConn extends EngineConn {
override def setEngineConnManagerEnv(env: EngineConnManagerEnv): Unit = this.ecmEnv = env
- override def toString = s"DefaultEngineConn($status, $tickedId, $instance, $pid)"
+ override def toString: String = s"DefaultEngineConn($status, $tickedId, $instance, $pid)"
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/ECMHook.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/ECMHook.scala
index cce893884..57d601115 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/ECMHook.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/ECMHook.scala
@@ -31,5 +31,5 @@ trait ECMHook {
object ECMHook {
val ecmHooks = Array[ECMHook](new JarUDFLoadECMHook)
- def getECMHooks = ecmHooks
+ def getECMHooks: Array[ECMHook] = ecmHooks
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/metrics/DefaultECMMetrics.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/metrics/DefaultECMMetrics.scala
index e1568cf5f..6593d3141 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/metrics/DefaultECMMetrics.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/metrics/DefaultECMMetrics.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.common.entity.enumeration.NodeStatus._
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
class DefaultECMMetrics extends ECMMetrics {
@@ -54,7 +54,7 @@ class DefaultECMMetrics extends ECMMetrics {
override def getFailedEngineConns: Array[EngineConn] = getEngineConns(failedEngineConnMap)
private val getEngineConns = (map: ConcurrentHashMap[String, EngineConn]) =>
- map.values().toSeq.toArray
+ map.values().asScala.toSeq.toArray
private val decreaseEngineConnMetric =
(engineConn: EngineConn, map: ConcurrentHashMap[String, EngineConn], count: AtomicInteger) => {
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnYarnLogOperator.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnYarnLogOperator.scala
index 764ecd0a8..feaaab862 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnYarnLogOperator.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnYarnLogOperator.scala
@@ -38,7 +38,7 @@ class EngineConnYarnLogOperator extends EngineConnLogOperator {
result
} {
result.get("logPath") match {
- case Some(path: String) => {
+ case Some(path: String) =>
val logFile = new File(path)
if (logFile.exists() && logFile.getName.startsWith(".")) {
// If is a temporary file, drop it
@@ -47,7 +47,6 @@ class EngineConnYarnLogOperator extends EngineConnLogOperator {
logger.warn(s"Fail to delete the temporary yarn log file: [$path]")
}
}
- }
}
}
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
index 40062ba3d..5d7da6b91 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
@@ -21,5 +21,5 @@ import org.apache.linkis.ecm.core.listener.{ECMEvent, ECMEventListener}
import org.apache.linkis.ecm.server.service.ECMMetricsService
class DefaultECMMetricsService extends ECMMetricsService with ECMEventListener {
- override def onEvent(event: ECMEvent): Unit = ???
+ override def onEvent(event: ECMEvent): Unit = {}
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala
index 28c71e479..a36db6de5 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala
@@ -48,11 +48,11 @@ class DefaultECMRegisterService extends ECMRegisterService with ECMEventListener
}
private def getLabelsFromArgs(params: Array[String]): util.Map[String, AnyRef] = {
- import scala.collection.JavaConversions._
+ import scala.collection.JavaConverters._
val labelRegex = """label\.(.+)\.(.+)=(.+)""".r
val labels = new util.HashMap[String, AnyRef]()
// TODO: magic
- labels += LabelKeyConstant.SERVER_ALIAS_KEY -> Collections.singletonMap(
+ labels.asScala += LabelKeyConstant.SERVER_ALIAS_KEY -> Collections.singletonMap(
"alias",
ENGINE_CONN_MANAGER_SPRING_NAME
)
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala
index faa91c88b..b7fbfd50d 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils
import java.util
import java.util.concurrent.ConcurrentHashMap
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import com.google.common.collect.Interners
@@ -59,12 +59,14 @@ class DefaultEngineConnListService
engineConnMap.get(engineConnId)
)
- override def getEngineConns: util.List[EngineConn] = engineConnMap.values().toList
+ override def getEngineConns: util.List[EngineConn] =
+ new util.ArrayList[EngineConn](engineConnMap.values())
override def addEngineConn(engineConn: EngineConn): Unit = {
logger.info(s"add engineConn ${engineConn.getServiceInstance} to engineConnMap")
- if (LinkisECMApplication.isReady)
+ if (LinkisECMApplication.isReady) {
engineConnMap.put(engineConn.getTickedId, engineConn)
+ }
}
override def killEngineConn(engineConnId: String): Unit = {
@@ -86,6 +88,7 @@ class DefaultEngineConnListService
override def getUsedResources: Resource = engineConnMap
.values()
+ .asScala
.map(_.getResource.getMinResource)
.fold(Resource.initResource(ResourceType.Default))(_ + _)
@@ -170,6 +173,7 @@ class DefaultEngineConnListService
logger.info("start to kill all engines belonging the ecm")
engineConnMap
.values()
+ .asScala
.foreach(engineconn => {
killECByEngineConnKillService(engineconn)
})
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
index cff94d50c..f5c936114 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
@@ -29,7 +29,7 @@ import org.apache.commons.io.{FileUtils, IOUtils}
import java.io.{File, InputStream}
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
object ECMUtils {
@@ -46,9 +46,9 @@ object ECMUtils {
}
if (!response.isSuccess) throw new ECMErrorException(911115, "failed to downLoad(下载失败)")
val map = new util.HashMap[String, Object]
- map += "path" -> response.fullFilePath
- map += "is" -> response.inputStream
- }
+ map.asScala += "path" -> response.fullFilePath
+ map.asScala += "is" -> response.inputStream
+ }.asJava
def downLoadBmlResourceToLocal(resource: BmlResource, userName: String, path: String)(implicit
fs: FileSystem
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org