This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 5c4e7799b [optimize] Limits the log length that the ec sends to the
entrance (#4831)
5c4e7799b is described below
commit 5c4e7799b3c453fe6919d0ee7b569698cd006678
Author: 人生有如两个橘子 <[email protected]>
AuthorDate: Thu Jul 27 17:35:21 2023 +0800
[optimize] Limits the log length that the ec sends to the entrance (#4831)
this close #4830
---
.../computation/executor/conf/ComputationExecutorConf.scala | 6 ++++++
.../computation/executor/execute/EngineExecutionContext.scala | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala
index fec2fe5e7..c072c3279 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala
@@ -118,4 +118,10 @@ object ComputationExecutorConf {
val TASK_SUBMIT_WAIT_TIME_MS =
CommonVars("linkis.ec.task.submit.wait.time.ms", 2L, "Task submit wait
time(ms)").getValue
+ val ENGINE_SEND_LOG_TO_ENTRANCE_LIMIT_ENABLED =
+ CommonVars("linkis.ec.send.log.entrance.limit.enabled", true)
+
+ val ENGINE_SEND_LOG_TO_ENTRANCE_LIMIT_LENGTH =
+ CommonVars("linkis.ec.send.log.entrance.limit.length", 2000)
+
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
index 7367dd533..377c32c19 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
@@ -193,8 +193,16 @@ class EngineExecutionContext(executor:
ComputationExecutor, executorUser: String
def appendStdout(log: String): Unit = if (executor.isInternalExecute) {
logger.info(log)
} else {
+ var taskLog = log
+ if (
+
ComputationExecutorConf.ENGINE_SEND_LOG_TO_ENTRANCE_LIMIT_ENABLED.getValue &&
+ log.length >
ComputationExecutorConf.ENGINE_SEND_LOG_TO_ENTRANCE_LIMIT_LENGTH.getValue
+ ) {
+ taskLog =
+ s"${log.substring(0,
ComputationExecutorConf.ENGINE_SEND_LOG_TO_ENTRANCE_LIMIT_LENGTH.getValue)}..."
+ }
val listenerBus = getEngineSyncListenerBus
- getJobId.foreach(jId => listenerBus.postToAll(TaskLogUpdateEvent(jId,
log)))
+ getJobId.foreach(jId => listenerBus.postToAll(TaskLogUpdateEvent(jId,
taskLog)))
}
override def close(): Unit = {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
