diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/AbWorkerRequestHandler.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/AbWorkerRequestHandler.java index 9ef62dae..f1b68eec 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/AbWorkerRequestHandler.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/AbWorkerRequestHandler.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; +import tech.powerjob.common.enums.InstanceStatus; import tech.powerjob.common.request.*; import tech.powerjob.common.response.AskResponse; import tech.powerjob.common.serialize.JsonUtils; @@ -76,7 +77,7 @@ public abstract class AbWorkerRequestHandler implements IWorkerRequestHandler { .setJobId(req.getJobId()) .setInstanceId(req.getInstanceId()) .setWfInstanceId(req.getWfInstanceId()) - .setInstanceStatus(req.getInstanceStatus()) + .setInstanceStatus(InstanceStatus.of(req.getInstanceStatus())) .setDelayMs(startMs - req.getReportTime()) .setServerProcessStatus(TtReportInstanceStatusEvent.Status.SUCCESS); try { diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/impl/WorkerRequestAkkaHandler.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/impl/WorkerRequestAkkaHandler.java index 147b9df4..26f18be0 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/impl/WorkerRequestAkkaHandler.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/impl/WorkerRequestAkkaHandler.java @@ -24,7 +24,7 @@ public class WorkerRequestAkkaHandler extends AbstractActor { public static Props defaultProps(){ return Props.create(WorkerRequestAkkaHandler.class) - .withDispatcher("akka.worker-request-actor-dispatcher") + .withDispatcher("akka.w-r-c-d") .withRouter( new RoundRobinPool(Runtime.getRuntime().availableProcessors() * 4) .withResizer(new DefaultResizer( diff --git a/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/w2s/TtReportInstanceStatusEvent.java b/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/w2s/TtReportInstanceStatusEvent.java index 6eef0faf..d43e7db0 100644 --- a/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/w2s/TtReportInstanceStatusEvent.java +++ b/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/w2s/TtReportInstanceStatusEvent.java @@ -2,6 +2,7 @@ package tech.powerjob.server.monitor.events.w2s; import lombok.Setter; import lombok.experimental.Accessors; +import tech.powerjob.common.enums.InstanceStatus; import tech.powerjob.server.common.SJ; import tech.powerjob.server.monitor.Event; @@ -21,7 +22,7 @@ public class TtReportInstanceStatusEvent implements Event { private Long wfInstanceId; - private int instanceStatus; + private InstanceStatus instanceStatus; private Long delayMs; diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf b/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf index 7e2274cd..95afe889 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf +++ b/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf @@ -25,7 +25,8 @@ akka { } } - worker-request-actor-dispatcher { + # worker-request-core-dispatcher + w-r-c-d { # Dispatcher is the name of the event-based dispatcher type = Dispatcher # What kind of ExecutionService to use