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/02 03:49:12 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: scala code format alarm clear in linkis-accessible-executor (#3208)
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 d844595c1 feat: scala code format alarm clear in linkis-accessible-executor (#3208)
d844595c1 is described below
commit d844595c18c2988b1fa3918f25f2184e34eb7864
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Fri Sep 2 11:49:07 2022 +0800
feat: scala code format alarm clear in linkis-accessible-executor (#3208)
---
.../executor/conf/AccessibleExecutorSpringConfiguration.scala | 4 ++--
.../engineconn/acessible/executor/lock/EngineConnTimedLock.scala | 4 ++--
.../linkis/engineconn/acessible/executor/log/LogHelper.scala | 8 ++++----
.../acessible/executor/service/EngineConnTimedLockService.scala | 8 ++++----
.../linkis/engineconn/callback/service/EngineConnCallback.scala | 3 +--
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorSpringConfiguration.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorSpringConfiguration.scala
index 524e0d9f9..475873c9d 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorSpringConfiguration.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorSpringConfiguration.scala
@@ -43,9 +43,9 @@ class AccessibleExecutorSpringConfiguration extends Logging {
def createLockManager(): LockService = {
val lockService =
- if (AccessibleExecutorConfiguration.ENGINECONN_SUPPORT_PARALLELISM.getValue)
+ if (AccessibleExecutorConfiguration.ENGINECONN_SUPPORT_PARALLELISM.getValue) {
new EngineConnConcurrentLockService
- else new EngineConnTimedLockService
+ } else new EngineConnTimedLockService
asyncListenerBusContext.addListener(lockService)
lockService
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/lock/EngineConnTimedLock.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/lock/EngineConnTimedLock.scala
index 3d01613c8..26a920379 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/lock/EngineConnTimedLock.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/lock/EngineConnTimedLock.scala
@@ -169,9 +169,9 @@ class EngineConnTimedLock(private var timeout: Long)
}
private def unlockCallback(lockStr: String): Unit = {
- /*if (null != lockedBy) {
+ /* if (null != lockedBy) {
lockedBy.transition(NodeStatus.Unlock)
- }*/
+ } */
val executors = ExecutorManager.getInstance.getExecutors.filter(executor =>
null != executor && !executor.isClosed
)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala
index 42fc9f588..41232eee4 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.engineconn.core.EngineConnObject
import java.util
import java.util.concurrent.TimeUnit
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
object LogHelper extends Logging {
@@ -59,8 +59,8 @@ object LogHelper extends Logging {
}
if (logs != null && logs.size > 0) {
val sb: StringBuilder = new StringBuilder
- import scala.collection.JavaConversions._
- logs map (log => log + "\n") foreach sb.append
+ import scala.collection.JavaConverters._
+ logs.asScala map (log => log + "\n") foreach sb.append
logListener.onLogUpdate(TaskLogUpdateEvent(null, sb.toString))
}
}
@@ -108,7 +108,7 @@ object LogHelper extends Logging {
val logs = logCache.getRemain
val sb = new StringBuilder
- for (log <- logs) {
+ for (log <- logs.asScala) {
sb.append(log).append("\n")
}
if (EngineConnObject.isReady) {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
index 15fb9130d..4d85fab48 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
@@ -198,12 +198,12 @@ class EngineConnConcurrentLockService extends LockService {
override def isLockExist(lock: String): Boolean = true
override def tryLock(requestEngineLock: RequestEngineLock): Option[String] = {
- /*ExecutorManager.getInstance().getDefaultExecutor match {
+ /* ExecutorManager.getInstance().getDefaultExecutor match {
case accessibleExecutor: AccessibleExecutor =>
// Concurrent Engine don't change status when get lock, status will change in other rules
// accessibleExecutor.transition(NodeStatus.Idle)
case _ =>
- }*/
+ } */
Some("lock")
}
@@ -213,11 +213,11 @@ class EngineConnConcurrentLockService extends LockService {
* @param lock
*/
override def unlock(lock: String): Boolean = {
- /*ExecutorManager.getInstance().getDefaultExecutor match {
+ /* ExecutorManager.getInstance().getDefaultExecutor match {
case accessibleExecutor: AccessibleExecutor =>
accessibleExecutor.transition(NodeStatus.Unlock)
case _ =>
- }*/
+ } */
true
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/callback/service/EngineConnCallback.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/callback/service/EngineConnCallback.scala
index 60f6559ea..8a028d0a9 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/callback/service/EngineConnCallback.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/callback/service/EngineConnCallback.scala
@@ -42,13 +42,12 @@ abstract class AbstractEngineConnStartUpCallback(emInstance: ServiceInstance)
def callback(protocol: RequestProtocol): Unit = {
protocol match {
- case protocol: EngineConnStatusCallback => {
+ case protocol: EngineConnStatusCallback =>
if (protocol.status.equals(NodeStatus.Failed)) {
logger.error(s"protocol will send to em: ${protocol}")
} else {
logger.info(s"protocol will send to em: ${protocol}")
}
- }
case _ =>
}
getEMSender.send(protocol)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org