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/06/07 12:44:49 UTC
[incubator-linkis] 03/09: 1. fix DefaultProgressOperation
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 27f91caea96c9bb52a05ea6fb35ec7cceb3c3540
Author: alexkun <xu...@qq.com>
AuthorDate: Mon May 16 21:30:20 2022 +0800
1. fix DefaultProgressOperation
---
.../computation/operation/progress/AbstractProgressOperation.scala | 4 ++--
.../computation/operation/progress/DefaultProgressOperation.scala | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/AbstractProgressOperation.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/AbstractProgressOperation.scala
index f1c6d5f98..5840e684b 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/AbstractProgressOperation.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/AbstractProgressOperation.scala
@@ -74,12 +74,12 @@ abstract class AbstractProgressOperation(orchestratorSession: OrchestratorSessio
eventName = event.getClass.getName
}
if (null != t) {
- message = t.getMessage
+ message = t.getClass.getSimpleName + t.getMessage
if (null != t.getCause) {
cause = t.getCause.getMessage
}
}
- debug(s"Accept error event ${eventName} in progress operation, message: ${message}, cause : ${cause}")
+ logger.warn(s"Accept error event ${eventName} in progress operation, message: ${message}, cause : ${cause}")
}
}
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/DefaultProgressOperation.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/DefaultProgressOperation.scala
index 4f6819cc7..1a900c053 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/DefaultProgressOperation.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/DefaultProgressOperation.scala
@@ -60,10 +60,10 @@ class DefaultProgressOperation(orchestratorSession: OrchestratorSession) extends
override def onProgressOn(oriTaskRunningInfoEvent: TaskRunningInfoEvent): Unit = {
var taskRunningInfoEvent: TaskRunningInfoEvent = null
val execTaskInfo = generateExecTaskInfo(oriTaskRunningInfoEvent.execTask)
- if (null != taskRunningInfoEvent.infoMap) {
- taskRunningInfoEvent.infoMap.putAll(execTaskInfo)
+ if (null != oriTaskRunningInfoEvent.infoMap) {
+ oriTaskRunningInfoEvent.infoMap.putAll(execTaskInfo)
taskRunningInfoEvent = TaskRunningInfoEvent(oriTaskRunningInfoEvent.execTask, oriTaskRunningInfoEvent.progress,
- oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, taskRunningInfoEvent.infoMap)
+ oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, oriTaskRunningInfoEvent.infoMap)
} else {
taskRunningInfoEvent = TaskRunningInfoEvent(oriTaskRunningInfoEvent.execTask, oriTaskRunningInfoEvent.progress,
oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, execTaskInfo)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org