zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server][ executor]- 完成底层的代码 - 2

Browse Source
This commit is contained in:
zeaslity
2023-02-28 21:56:31 +08:00
parent a47ede755f
commit 0959aebf67
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java
View File

@@ -104,7 +104,7 @@ public interface AsyncExecutionService {
* @param durationTask * @param durationTask
* @return * @return
*/ */
OctopusMessage SyncCallSendCommandToAgent( OctopusMessage AsyncCallSendCommandToAgent(
String agentTopicName, String agentTopicName,
String type, String type,
List<String> commandList, List<String> commandList,

4
server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java
View File

@@ -135,7 +135,7 @@ public class AsyncExecutionServiceImpl implements AsyncExecutionService {
} }
// 调用最底层的方法 // 调用最底层的方法
this.SyncCallSendCommandToAgent( this.AsyncCallSendCommandToAgent(
agentTopicName, agentTopicName,
type, type,
commandList, commandList,
@@ -149,7 +149,7 @@ public class AsyncExecutionServiceImpl implements AsyncExecutionService {
} }
@Override @Override
public OctopusMessage SyncCallSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) { public OctopusMessage AsyncCallSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) {
// 检查agentTopicName是否存在 // 检查agentTopicName是否存在
if (!ALL_AGENT_TOPIC_NAME_SET.contains(agentTopicName)) { if (!ALL_AGENT_TOPIC_NAME_SET.contains(agentTopicName)) {

4
server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java
View File

@@ -180,7 +180,7 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
@Override @Override
public ArrayList<String> SyncSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) { public ArrayList<String> SyncSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) {
OctopusMessage octopusMessage = asyncExecutionService.SyncCallSendCommandToAgent( OctopusMessage octopusMessage = asyncExecutionService.AsyncCallSendCommandToAgent(
agentTopicName, agentTopicName,
type, type,
commandList, commandList,
@@ -220,7 +220,6 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
TimeUnit.SECONDS TimeUnit.SECONDS
); );
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally { } finally {
@@ -229,7 +228,6 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
// 停止等待结果 // 停止等待结果
asyncWaitOMResult.stopWaiting(omReplayContend); asyncWaitOMResult.stopWaiting(omReplayContend);
// 解析结果 // 解析结果
omReplayContend omReplayContend
.getReplayOMList() .getReplayOMList()