gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(sj_1.1.0-beta2): 变更NettyResult的requestId-> reqId

Browse Source
This commit is contained in:
opensnail 2024-07-06 23:27:13 +08:00
parent c4551b974e
commit b371a092cf
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/log/report/ReportLogListener.java
View File

@ -22,7 +22,7 @@ public class ReportLogListener implements Listener<LogTaskDTO> {
private static final NettyClient CLIENT = RequestBuilder.<NettyClient, NettyResult>newBuilder() private static final NettyClient CLIENT = RequestBuilder.<NettyClient, NettyResult>newBuilder()
.client(NettyClient.class) .client(NettyClient.class)
.callback(nettyResult -> SnailJobLog.LOCAL.info("Data report log successfully requestId:[{}]", nettyResult.getRequestId())).build(); .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report log successfully requestId:[{}]", nettyResult.getReqId())).build();
@Override @Override
public void handler(List<LogTaskDTO> list) { public void handler(List<LogTaskDTO> list) {

4
snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyHttpClientHandler.java
View File

@ -36,7 +36,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler<FullHttp
client = RequestBuilder.<NettyClient, NettyResult>newBuilder() client = RequestBuilder.<NettyClient, NettyResult>newBuilder()
.client(NettyClient.class) .client(NettyClient.class)
.callback( .callback(
nettyResult -> SnailJobLog.LOCAL.debug("heartbeat check requestId:[{}]", nettyResult.getRequestId())) nettyResult -> SnailJobLog.LOCAL.debug("heartbeat check requestId:[{}]", nettyResult.getReqId()))
.build(); .build();
this.nettyHttpConnectClient = nettyHttpConnectClient; this.nettyHttpConnectClient = nettyHttpConnectClient;
@ -51,7 +51,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler<FullHttp
SnailJobLog.LOCAL.debug("Receive server data content:[{}], headers:[{}]", content, headers); SnailJobLog.LOCAL.debug("Receive server data content:[{}], headers:[{}]", content, headers);
NettyResult nettyResult = JsonUtil.parseObject(content, NettyResult.class); NettyResult nettyResult = JsonUtil.parseObject(content, NettyResult.class);
RpcContext.invoke(nettyResult.getRequestId(), nettyResult, false); RpcContext.invoke(nettyResult.getReqId(), nettyResult, false);
} }

2
snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/supports/handler/SnailDispatcherRequestHandler.java
View File

@ -96,7 +96,7 @@ public class SnailDispatcherRequestHandler {
nettyResult.setMessage(ex.getMessage()).setStatus(StatusEnum.NO.getStatus()); nettyResult.setMessage(ex.getMessage()).setStatus(StatusEnum.NO.getStatus());
e = ex; e = ex;
} finally { } finally {
nettyResult.setRequestId(retryRequest.getReqId()); nettyResult.setReqId(retryRequest.getReqId());
if (Objects.nonNull(resultObj)) { if (Objects.nonNull(resultObj)) {
nettyResult.setData(resultObj.getData()) nettyResult.setData(resultObj.getData())
.setMessage(resultObj.getMessage()) .setMessage(resultObj.getMessage())

3
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java
View File

@ -33,7 +33,6 @@ import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
@ -62,7 +61,7 @@ public class JobExecutorFutureCallback implements FutureCallback<ExecuteResult>
sendMessage(nettyResult.getMessage()); sendMessage(nettyResult.getMessage());
} }
SnailJobLog.LOCAL.debug("Job execute result report successfully requestId:[{}]", SnailJobLog.LOCAL.debug("Job execute result report successfully requestId:[{}]",
nettyResult.getRequestId()); nettyResult.getReqId());
}).build(); }).build();
private final JobContext jobContext; private final JobContext jobContext;

2
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java
View File

@ -54,7 +54,7 @@ public class ReportListener implements Listener<RetryTaskDTO> {
private static final NettyClient CLIENT = RequestBuilder.<NettyClient, NettyResult>newBuilder() private static final NettyClient CLIENT = RequestBuilder.<NettyClient, NettyResult>newBuilder()
.client(NettyClient.class) .client(NettyClient.class)
.callback(nettyResult -> SnailJobLog.LOCAL.info("Data report successfully requestId:[{}]", nettyResult.getRequestId())).build(); .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report successfully requestId:[{}]", nettyResult.getReqId())).build();
@Override @Override
public void handler(List<RetryTaskDTO> list) { public void handler(List<RetryTaskDTO> list) {

10
snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/model/NettyResult.java
View File

@ -13,18 +13,18 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
public class NettyResult extends Result<Object> { public class NettyResult extends Result<Object> {
private long requestId; private long reqId;
public NettyResult(int status, String message, Object data, long requestId) { public NettyResult(int status, String message, Object data, long reqId) {
super(status, message, data); super(status, message, data);
this.requestId = requestId; this.reqId = reqId;
} }
public NettyResult() { public NettyResult() {
} }
public NettyResult(Object data, long requestId) { public NettyResult(Object data, long reqId) {
super(data); super(data);
this.requestId = requestId; this.reqId = reqId;
} }
} }

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyHttpClientHandler.java
View File

@ -33,7 +33,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler<FullHttp
SnailJobLog.LOCAL.info("Receive server data content:[{}], headers:[{}]", content, headers); SnailJobLog.LOCAL.info("Receive server data content:[{}], headers:[{}]", content, headers);
NettyResult nettyResult = JsonUtil.parseObject(content, NettyResult.class); NettyResult nettyResult = JsonUtil.parseObject(content, NettyResult.class);
RpcContext.invoke(nettyResult.getRequestId(), nettyResult, false); RpcContext.invoke(nettyResult.getReqId(), nettyResult, false);
} }

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java
View File

@ -120,7 +120,7 @@ public class WorkflowExecutorActor extends AbstractActor {
} }
} }
log.warn("父节点:[{}] 所有的节点:[{}]", taskExecute.getParentId(), allSuccessors); log.debug("父节点:[{}] 所有的节点:[{}]", taskExecute.getParentId(), allSuccessors);
// 若所有的兄弟节点的子节点都没有后继节点可以完成次任务 // 若所有的兄弟节点的子节点都没有后继节点可以完成次任务
if (CollUtil.isEmpty(allSuccessors)) { if (CollUtil.isEmpty(allSuccessors)) {