You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by te...@apache.org on 2020/02/21 12:33:05 UTC
[incubator-dolphinscheduler] branch refactor-worker updated
(ff86dc7 -> 0e0c479)
This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a change to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from ff86dc7 1, master persistent task 2. extract master and worker communication model (#1992)
add 63b76d7 add TaskResponseProcessor
new 0e0c479 Merge branch 'refactor-worker' into refactor-worker
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java | 2 --
.../dolphinscheduler/server/worker/runner/TaskScheduleThread.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
[incubator-dolphinscheduler] 01/01: Merge branch 'refactor-worker'
into refactor-worker
Posted by te...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 0e0c47925bef68dafbed5df239a8126932741505
Merge: ff86dc7 63b76d7
Author: Tboy <te...@yeah.net>
AuthorDate: Fri Feb 21 20:32:58 2020 +0800
Merge branch 'refactor-worker' into refactor-worker
.../dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java | 2 --
.../dolphinscheduler/server/worker/runner/TaskScheduleThread.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --cc dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
index 4ae057a,a261b34..09005a1
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
@@@ -128,23 -124,11 +128,21 @@@ public class MasterBaseTaskExecThread i
// TODO send task to worker
public void sendToWorker(TaskInstance taskInstance){
final Address address = new Address("127.0.0.1", 12346);
-
- ExecuteTaskRequestCommand taskRequestCommand = new ExecuteTaskRequestCommand(FastJsonSerializer.serializeToString(taskInstance));
+ /**
+ * set taskInstance relation
+ */
+ TaskInstance destTaskInstance = setTaskInstanceRelation(taskInstance);
+
+ ExecuteTaskRequestCommand taskRequestCommand = new ExecuteTaskRequestCommand(
+ FastJsonSerializer.serializeToString(convertToTaskInfo(destTaskInstance)));
try {
- Command responseCommand = nettyRemotingClient.sendSync(address, taskRequestCommand.convert2Command(), Integer.MAX_VALUE);
- ExecuteTaskAckCommand taskAckCommand = FastJsonSerializer.deserialize(responseCommand.getBody(), ExecuteTaskAckCommand.class);
+ Command responseCommand = nettyRemotingClient.sendSync(address,
+ taskRequestCommand.convert2Command(), Integer.MAX_VALUE);
+
+ ExecuteTaskAckCommand taskAckCommand = FastJsonSerializer.deserialize(
+ responseCommand.getBody(), ExecuteTaskAckCommand.class);
+
logger.info("taskAckCommand : {}",taskAckCommand);
-
processService.changeTaskState(ExecutionStatus.of(taskAckCommand.getStatus()),
taskAckCommand.getStartTime(),
taskAckCommand.getHost(),