You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/23 12:40:50 UTC
[incubator-linkis] branch dev-1.1.1 updated: Dev 1.1.1 ec task monitor switch (#1782)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
new 6a248b8 Dev 1.1.1 ec task monitor switch (#1782)
6a248b8 is described below
commit 6a248b8719bdf261fdf63e78dc220049b80f91c1
Author: Shang <no...@live.com>
AuthorDate: Wed Mar 23 20:40:42 2022 +0800
Dev 1.1.1 ec task monitor switch (#1782)
* Added comment for code-review
* fixes #1781 [engineConn] moved configurable shutdown in monitor to service
* [engineConn] ECTaskMonitor condition java to scala
* [engineConn] ECTaskMonitor added license
modified TODO position
---
.../ujes/client/request/JobSubmitAction.scala | 1 +
.../SingleThreadUpstreamConnectionMonitor.scala | 6 -----
.../service/ECTaskEntranceMonitorService.scala | 14 ++++++-----
...CTaskEntranceMonitorServiceStartCondition.scala | 28 ++++++++++++++++++++++
.../interceptor/impl/CustomVariableUtils.scala | 2 +-
.../interceptor/impl/LabelCheckInterceptor.scala | 1 +
.../ujes/route/AbstractLabelGatewayRouter.scala | 1 +
7 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
index c637033..1edc4c1 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
@@ -37,6 +37,7 @@ object JobSubmitAction {
class Builder private[JobSubmitAction]() {
private var user: String = _
+ //TODO: remove executeUser in the future
private var executeUser: String = _
private var executionContent: util.Map[String, Any] = _
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/SingleThreadUpstreamConnectionMonitor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/SingleThreadUpstreamConnectionMonitor.scala
index 273dbe8..6886a75 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/SingleThreadUpstreamConnectionMonitor.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/SingleThreadUpstreamConnectionMonitor.scala
@@ -36,8 +36,6 @@ abstract class SingleThreadUpstreamConnectionMonitor(name: String, infoAccess: C
private val monitorDaemon = new ScheduledThreadPoolExecutor(3, new BasicThreadFactory.Builder().namingPattern(name + "-%d").daemon(true).build)
- private val shouldStart = ComputationExecutorConf.UPSTREAM_MONITOR_ECTASK_SHOULD_START
-
private var started = false
override def getUpstreamNodeInfoAccess(): ConnectionInfoAccess = infoAccess
@@ -49,10 +47,6 @@ abstract class SingleThreadUpstreamConnectionMonitor(name: String, infoAccess: C
def generateHandlerRequest(wrapperList: util.List[ConnectionInfoWrapper]): MonitorHandlerRequest
def start(): Unit = this.synchronized {
- if (!shouldStart) {
- info("Upstream-monitor is configured to be off. Will not monitor upstream connection for engine-task")
- return
- }
if (!started) {
panicIfNull(infoAccess, "infoAccess should not be null")
panicIfNull(handler, "handler should not be null")
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorService.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorService.scala
index c871574..2f752a4 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorService.scala
@@ -18,7 +18,6 @@
package org.apache.linkis.engineconn.computation.executor.upstream.service
import javax.annotation.PostConstruct
-
import org.apache.linkis.common.listener.Event
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.engineconn.computation.executor.upstream.ECTaskEntranceMonitor
@@ -27,20 +26,19 @@ import org.apache.linkis.engineconn.computation.executor.upstream.listener.TaskS
import org.apache.linkis.engineconn.executor.listener.ExecutorListenerBusContext
import org.apache.linkis.engineconn.executor.listener.event.EngineConnSyncEvent
import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
-import org.springframework.stereotype.Component
+import org.springframework.context.annotation.Conditional
-@Component
+@Conditional(Array(classOf[ECTaskEntranceMonitorServiceStartCondition]))
class ECTaskEntranceMonitorService extends TaskStatusChangedForUpstreamMonitorListener with Logging {
- //add a layer
+
private val eCTaskEntranceMonitor = new ECTaskEntranceMonitor
private val syncListenerBus = ExecutorListenerBusContext.getExecutorListenerBusContext.getEngineConnSyncListenerBus
- //TODO: configuration for start or not
+
@PostConstruct
def init(): Unit = {
syncListenerBus.addListener(this)
eCTaskEntranceMonitor.start
- //TODO: shutdown
}
override def onEvent(event: EngineConnSyncEvent): Unit = event match {
@@ -65,4 +63,8 @@ class ECTaskEntranceMonitorService extends TaskStatusChangedForUpstreamMonitorLi
override def onEventError(event: Event, t: Throwable): Unit = {
}
+
+ def shutdown(): Unit = {
+ eCTaskEntranceMonitor.shutdown
+ }
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorServiceStartCondition.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorServiceStartCondition.scala
new file mode 100644
index 0000000..b23489f
--- /dev/null
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/service/ECTaskEntranceMonitorServiceStartCondition.scala
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.engineconn.computation.executor.upstream.service;
+
+
+import org.apache.linkis.engineconn.computation.executor.conf.ComputationExecutorConf
+import org.springframework.context.annotation.Condition
+import org.springframework.context.annotation.ConditionContext
+import org.springframework.core.`type`.AnnotatedTypeMetadata;
+
+class ECTaskEntranceMonitorServiceStartCondition extends Condition {
+ override def matches(conditionContext: ConditionContext, annotatedTypeMetadata: AnnotatedTypeMetadata): Boolean = ComputationExecutorConf.UPSTREAM_MONITOR_ECTASK_SHOULD_START
+}
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
index 208e668..4991292 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
@@ -37,7 +37,7 @@ import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.util.control.Exception._
-
+//TODO: optimize code, 拆分Utils类
object CustomVariableUtils extends Logging {
//hql sql jdbc to sql python to py
private val SQL_TYPE = "sql"
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
index 115fb83..3511fb1 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
@@ -72,6 +72,7 @@ class LabelCheckInterceptor extends EntranceInterceptor {
if (StringUtils.isNotBlank(userCreator.getUser)) {
return
}
+ //TODO: need one more check to see if userCreatorLabel equals executeUser
}
throw LabelCheckException(50079, "UserCreatorLabel must be need")
}
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
index 916fb02..3913382 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
@@ -47,6 +47,7 @@ abstract class AbstractLabelGatewayRouter extends AbstractGatewayRouter with Log
if (StringUtils.isNotBlank(serviceInstance.getApplicationName) && StringUtils.isNotBlank(serviceInstance.getInstance)) {
return serviceInstance
}
+ // TODO: It's probably better to throw exception here
if (null == routeLabels || routeLabels.isEmpty) {
return null
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org