natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use common response for sync request (#13847)

This commit is contained in:
Wenjun Ruan 2023-04-01 10:45:21 +08:00 committed by GitHub
parent 8f3a23dae5
commit 9b269b3c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessor.java
View File

@ -52,7 +52,7 @@ public class TaskKillResponseProcessor implements NettyRequestProcessor {
@Override
public MessageType getCommandType() {
return MessageType.TASK_KILL_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java
View File

@ -64,7 +64,7 @@ public class TaskKillResponseProcessorTest {
@Test
public void testProcess() {
Message message = taskKillResponse.convert2Command(1);
Assertions.assertEquals(MessageType.TASK_KILL_RESPONSE, message.getType());
Assertions.assertEquals(MessageType.RESPONSE, message.getType());
taskKillResponseProcessor.process(channel, message);
}
}

29
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/MessageType.java
View File

@ -19,28 +19,18 @@ package org.apache.dolphinscheduler.remote.command;
public enum MessageType {
RESPONSE,
GET_APP_ID_REQUEST,
GET_APP_ID_RESPONSE,
REMOVE_TAK_LOG_REQUEST,
REMOVE_TAK_LOG_RESPONSE,
ROLL_VIEW_LOG_REQUEST,
ROLL_VIEW_LOG_RESPONSE,
VIEW_WHOLE_LOG_REQUEST,
VIEW_WHOLE_LOG_RESPONSE,
GET_LOG_BYTES_REQUEST,
GET_LOG_BYTES_RESPONSE,
WORKER_REQUEST,
MASTER_RESPONSE,
/**
* task execute start, from api to master
*/
@ -73,8 +63,6 @@ public enum MessageType {
TASK_KILL_REQUEST,
TASK_KILL_RESPONSE,
TASK_REJECT,
TASK_REJECT_MESSAGE_ACK,
@ -84,11 +72,6 @@ public enum MessageType {
*/
TASK_SAVEPOINT_REQUEST,
/**
* task savepoint ack, for stream task
*/
TASK_SAVEPOINT_RESPONSE,
HEART_BEAT,
PING,
@ -97,10 +80,7 @@ public enum MessageType {
ALERT_SEND_REQUEST,
ALERT_SEND_RESPONSE,
WORKFLOW_HOST_CHANGE_REQUEST,
WORKFLOW_HOST_CHANGE_RESPONSE,
/**
* state event request
@ -134,10 +114,5 @@ public enum MessageType {
*/
TASK_UPDATE_PID__MESSAGE_ACK,
/**
* workflow executing data response, from master to api
*/
WORKFLOW_EXECUTING_DATA_RESPONSE,
WORKFLOW_METRICS_CLEANUP;
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponse.java
View File

@ -42,7 +42,7 @@ public class AlertSendResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.ALERT_SEND_RESPONSE;
return MessageType.RESPONSE;
}
@Data

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetAppIdResponse.java
View File

@ -35,6 +35,6 @@ public class GetAppIdResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.GET_APP_ID_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponse.java
View File

@ -39,7 +39,7 @@ public class GetLogBytesResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.GET_LOG_BYTES_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogResponse.java
View File

@ -39,6 +39,6 @@ public class RemoveTaskLogResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.REMOVE_TAK_LOG_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogResponse.java
View File

@ -39,6 +39,6 @@ public class RollViewLogResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.ROLL_VIEW_LOG_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogResponseResponse.java
View File

@ -39,6 +39,6 @@ public class ViewLogResponseResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.VIEW_WHOLE_LOG_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/task/TaskKillResponse.java
View File

@ -52,6 +52,6 @@ public class TaskKillResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.TASK_KILL_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/task/TaskSavePointResponse.java
View File

@ -39,6 +39,6 @@ public class TaskSavePointResponse implements RequestMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.TASK_SAVEPOINT_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/task/WorkflowHostChangeResponse.java
View File

@ -45,6 +45,6 @@ public class WorkflowHostChangeResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.WORKFLOW_HOST_CHANGE_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/workflow/WorkflowExecutingDataResponse.java
View File

@ -37,6 +37,6 @@ public class WorkflowExecutingDataResponse implements ResponseMessageBuilder {
@Override
public MessageType getCommandType() {
return MessageType.WORKFLOW_EXECUTING_DATA_RESPONSE;
return MessageType.RESPONSE;
}
}

2
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseTest.java
View File

@ -44,6 +44,6 @@ public class AlertSendResponseTest {
alertSendResponse.setResResults(responseResults);
Message message = alertSendResponse.convert2Command(1);
Assertions.assertEquals(MessageType.ALERT_SEND_RESPONSE, message.getType());
Assertions.assertEquals(MessageType.RESPONSE, message.getType());
}
}