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:48 UTC
[incubator-linkis] 02/09: linkis-computation-orchestrator - fix
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 f49cd0759c83c21c7636815f478cde6b9ac85a92
Author: alexkun <xu...@qq.com>
AuthorDate: Thu May 12 20:12:23 2022 +0800
linkis-computation-orchestrator - fix
---
.../operation/progress/DefaultProgressOperation.scala | 9 +++++----
.../computation/operation/progress/ProgressProcessor.scala | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
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 88f5fb90a..4f6819cc7 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
@@ -61,11 +61,12 @@ class DefaultProgressOperation(orchestratorSession: OrchestratorSession) extends
var taskRunningInfoEvent: TaskRunningInfoEvent = null
val execTaskInfo = generateExecTaskInfo(oriTaskRunningInfoEvent.execTask)
if (null != taskRunningInfoEvent.infoMap) {
+ taskRunningInfoEvent.infoMap.putAll(execTaskInfo)
taskRunningInfoEvent = TaskRunningInfoEvent(oriTaskRunningInfoEvent.execTask, oriTaskRunningInfoEvent.progress,
- oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, ta)
+ oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, taskRunningInfoEvent.infoMap)
} else {
taskRunningInfoEvent = TaskRunningInfoEvent(oriTaskRunningInfoEvent.execTask, oriTaskRunningInfoEvent.progress,
- oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, generateExecTaskInfo(oriTaskRunningInfoEvent.execTask))
+ oriTaskRunningInfoEvent.progressInfo, oriTaskRunningInfoEvent.resourceMap, execTaskInfo)
}
val execTask = taskRunningInfoEvent.execTask
Option(execTask).foreach(task => {
@@ -100,7 +101,7 @@ class DefaultProgressOperation(orchestratorSession: OrchestratorSession) extends
}
Option(execTaskToProgressProcessor.get(execTask.getPhysicalContext.getRootTask.getId)).foreach( progress => {
- progress.onProgress(event.progress, event.progressInfo, event.resourceMap, event.resourceMap, event.infoMap)
+ progress.onProgress(event.progress, event.progressInfo, event.resourceMap, event.infoMap)
})
})
@@ -112,7 +113,7 @@ class DefaultProgressOperation(orchestratorSession: OrchestratorSession) extends
logger.warn("TaskRunningInfoEvent got null execTask.")
return map
}
- map.put(TaskConstants.EXEC_ID, task.getId())
+ map.put(TaskConstants.EXEC_ID, task.getId)
map.put(TaskConstants.ID_INFO, task.getIDInfo())
map.put(TaskConstants.TASK_CLASSNAME, task.getClass.getSimpleName)
map.put(TaskConstants.TASK_NAME, task.getName)
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/ProgressProcessor.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/ProgressProcessor.scala
index 680044651..807c4f1ad 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/ProgressProcessor.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/progress/ProgressProcessor.scala
@@ -41,7 +41,7 @@ class ProgressProcessor(rootExecTaskId: String,
}
def onProgress(progress: Float, progressInfo: Array[JobProgressInfo], resourceMap: util.HashMap[String, ResourceWithStatus], infoMap: util.HashMap[String, Object]): Unit = {
- val progressInfoWithResourceEvent = ProgressInfoEvent(orchestration, progress, progressInfo, resourceMap)
+ val progressInfoWithResourceEvent = ProgressInfoEvent(orchestration, progress, progressInfo, resourceMap, infoMap: util.HashMap[String, Object])
listeners.foreach(_(progressInfoWithResourceEvent))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org