diff --git a/others/script/jenkins_auto.sh b/others/script/jenkins_auto.sh index 3af4c6fa..7863f0c3 100644 --- a/others/script/jenkins_auto.sh +++ b/others/script/jenkins_auto.sh @@ -22,9 +22,11 @@ echo "================== 构建 powerjob-agent 镜像 ==================" docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit echo "================== 准备启动 powerjob-server ==================" docker run -d \ + --rm \ + --restart=always \ --name powerjob-server \ -p 7700:7700 -p 10086:10086 \ - -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://172.27.147.252:3306/oms-product?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://172.27.147.252:27017/oms-product" \ + -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://127.0.0.1:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://127.0.0.1:27017/powerjob-product" \ -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ tjqq/powerjob-server:latest sleep 60 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java index 3c434699..e5ef8513 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java @@ -68,7 +68,7 @@ public interface InstanceInfoRepository extends JpaRepository findByJobIdInAndStatusIn(List jobIds, List status); // 删除历史数据,JPA自带的删除居然是根据ID循环删,2000条数据删了几秒,也太拉垮了吧... - // 结果只能用 int 接受 + // 结果只能用 int 接收 @Modifying @Transactional @Query(value = "delete from instance_info where gmt_modified < ?1", nativeQuery = true) diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java index cb386261..ee85b297 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java @@ -80,10 +80,13 @@ public class InstanceManager { return jobInfoOpt.orElseThrow(() -> new IllegalArgumentException("can't find JobIno by jobId: " + jobId)); }); InstanceInfoDO instanceInfo = instanceInfoRepository.findByInstanceId(instanceId); - + if (instanceInfo == null) { + log.warn("[InstanceManager-{}] can't find InstanceInfo from database", instanceId); + return; + } // 丢弃过期的上报数据 if (req.getReportTime() <= instanceInfo.getLastReportTime()) { - log.warn("[InstanceManager-{}] receive the expired status report request: {}, this report will br dropped.", instanceId, req); + log.warn("[InstanceManager-{}] receive the expired status report request: {}, this report will be dropped.", instanceId, req); return; }