From 6b0467a8e50b829c14190a461fda3c11c63ded45 Mon Sep 17 00:00:00 2001 From: yaohui Date: Mon, 28 Jul 2025 11:27:40 +0800 Subject: [PATCH] upgrade schedulerx version --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- .../schedulerx/SchedulerxConfigurations.java | 2 +- .../schedulerx/SchedulerxProperties.java | 2 +- .../schedulerx/service/JobSyncService.java | 15 ++++++++++----- .../service/ScheduledJobSyncConfigurer.java | 7 ++----- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index a7449dc147..42cf0131ea 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -27,7 +27,7 @@ 4.23.0 - 1.11.4 + 1.13.1 3.2.1 diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxConfigurations.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxConfigurations.java index 6139cad45c..abdf30cf23 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxConfigurations.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxConfigurations.java @@ -160,7 +160,7 @@ public NoOpScheduler noOpScheduler() { @Bean public SchedulerxSchedulingConfigurer schedulerxSchedulingConfigurer() { - return new SchedulerxSchedulingConfigurer(); + return new SchedulerxSchedulingConfigurer(noOpScheduler(), true); } @Bean diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxProperties.java index 57cc511e44..98d09a983b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/SchedulerxProperties.java @@ -181,7 +181,7 @@ public class SchedulerxProperties implements InitializingBean { */ private String label; - private String labelPath = "/etc/podinfo/annotations"; + private String labelPath = "/etc/podinfo/labels"; /** * enableCgroupMetrics. diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/JobSyncService.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/JobSyncService.java index 67e6449fc5..7b2c1ae099 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/JobSyncService.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/JobSyncService.java @@ -102,12 +102,17 @@ public synchronized void syncJobs(Map jobs, String namespac for (Entry entry : jobs.entrySet()) { String jobName = entry.getKey(); JobProperty jobProperty = entry.getValue(); - JobConfigInfo jobConfigInfo = getJob(client, jobName, namespaceSource); - if (jobConfigInfo == null) { - createJob(client, jobName, jobProperty, namespaceSource); + try { + JobConfigInfo jobConfigInfo = getJob(client, jobName, namespaceSource); + if (jobConfigInfo == null) { + createJob(client, jobName, jobProperty, namespaceSource); + } + else if (jobProperty.isOverwrite()) { + updateJob(client, jobConfigInfo, jobProperty, namespaceSource); + } } - else if (jobProperty.isOverwrite()) { - updateJob(client, jobConfigInfo, jobProperty, namespaceSource); + catch (Exception e) { + logger.error("sync job {} failed. jobProperty:{}", jobName, JsonUtil.toJson(jobProperty), e); } } } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/ScheduledJobSyncConfigurer.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/ScheduledJobSyncConfigurer.java index 5f7075fdf1..7ae9f13614 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/ScheduledJobSyncConfigurer.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-schedulerx/src/main/java/com/alibaba/cloud/scheduling/schedulerx/service/ScheduledJobSyncConfigurer.java @@ -33,7 +33,7 @@ import com.alibaba.schedulerx.worker.domain.SpringScheduleProfile; import com.alibaba.schedulerx.worker.log.LogFactory; import com.alibaba.schedulerx.worker.log.Logger; -import com.alibaba.schedulerx.worker.processor.springscheduling.SchedulerxSchedulingConfigurer; +import com.alibaba.schedulerx.worker.processor.springscheduling.SchedulerxJobRegister; import org.springframework.aop.framework.AopProxyUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -64,9 +64,6 @@ public class ScheduledJobSyncConfigurer implements SchedulingConfigurer { @Autowired private SchedulerxProperties properties; - @Autowired - private SchedulerxSchedulingConfigurer schedulerxSchedulingConfigurer; - @Value("${" + SchedulerxProperties.CONFIG_PREFIX + ".task-overwrite:false}") private Boolean overwrite = false; @@ -175,7 +172,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { } // 获取仅SchedulerX注解任务 - Collection> schedulerXTasks = schedulerxSchedulingConfigurer.getSchedulerXTaskTargets(); + Collection> schedulerXTasks = SchedulerxJobRegister.getInstance().getSchedulerXTaskTargets(); if (schedulerXTasks != null && schedulerXTasks.size() > 0) { for (Pair task : schedulerXTasks) { JobProperty jobProperty = convertToJobProperty(null, task.getFirst(), task.getSecond());