This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new c785f6042d [fix] fixed an issue where cron jobs were not rescheduled
(#4159)
c785f6042d is described below
commit c785f6042d2e543ce01df01d190b041ca0c8d19e
Author: Duansg <[email protected]>
AuthorDate: Thu Jun 18 11:38:58 2026 +0800
[fix] fixed an issue where cron jobs were not rescheduled (#4159)
---
.../manager/scheduler/CollectorJobScheduler.java | 2 +
.../hertzbeat/manager/scheduler/SchedulerInit.java | 2 +
.../manager/service/impl/MonitorServiceImpl.java | 4 ++
.../scheduler/CollectorJobSchedulerTest.java | 43 ++++++++++++++++++++++
4 files changed, 51 insertions(+)
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
index 915b549e1f..b9512f60ec 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
@@ -149,6 +149,8 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
appDefine.setDefaultInterval(monitor.getIntervals());
appDefine.setCyclic(true);
appDefine.setTimestamp(System.currentTimeMillis());
+ appDefine.setScheduleType(monitor.getScheduleType());
+ appDefine.setCronExpression(monitor.getCronExpression());
Map<String, String> metadata =
Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
CommonConstants.LABEL_INSTANCE, monitor.getInstance());
appDefine.setMetadata(metadata);
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
index c1c9bfa01c..d91963c37c 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
@@ -118,6 +118,8 @@ public class SchedulerInit implements CommandLineRunner {
appDefine.setDefaultInterval(monitor.getIntervals());
appDefine.setCyclic(true);
appDefine.setTimestamp(System.currentTimeMillis());
+ appDefine.setScheduleType(monitor.getScheduleType());
+ appDefine.setCronExpression(monitor.getCronExpression());
String instance = monitor.getInstance();
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
index 7e06ef7822..d9fe4b9638 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@@ -181,6 +181,8 @@ public class MonitorServiceImpl implements MonitorService {
appDefine.setDefaultInterval(monitor.getIntervals());
appDefine.setCyclic(true);
appDefine.setTimestamp(System.currentTimeMillis());
+ appDefine.setScheduleType(monitor.getScheduleType());
+ appDefine.setCronExpression(monitor.getCronExpression());
String instance = monitor.getInstance();
// The port field may be null
@@ -780,6 +782,8 @@ public class MonitorServiceImpl implements MonitorService {
appDefine.setDefaultInterval(monitor.getIntervals());
appDefine.setCyclic(true);
appDefine.setTimestamp(System.currentTimeMillis());
+ appDefine.setScheduleType(monitor.getScheduleType());
+ appDefine.setCronExpression(monitor.getCronExpression());
Map<String, String> metadata =
Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
CommonConstants.LABEL_INSTANCE, monitor.getInstance());
appDefine.setMetadata(metadata);
diff --git
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/scheduler/CollectorJobSchedulerTest.java
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/scheduler/CollectorJobSchedulerTest.java
index e4df4231ca..10cc176142 100644
---
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/scheduler/CollectorJobSchedulerTest.java
+++
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/scheduler/CollectorJobSchedulerTest.java
@@ -148,4 +148,47 @@ public class CollectorJobSchedulerTest {
assertEquals("127.0.0.1:8080",
job.getMetadata().get(CommonConstants.LABEL_INSTANCE));
}
+ /**
+ * Regression test for issue #4157: when a collector goes online the
dispatched job must carry the
+ * monitor's cron schedule type and cron expression, otherwise the job
falls back to interval
+ * scheduling and the cron expression is ignored after restart / collector
reconnect.
+ */
+ @Test
+ public void testCollectorGoOnlinePropagatesCronSchedule() {
+ String identity = "collector-1";
+ CollectorInfo collectorInfo =
CollectorInfo.builder().ip("127.0.0.1").mode("public").version("1.0.0").build();
+ org.apache.hertzbeat.common.entity.manager.Collector collector =
org.apache.hertzbeat.common.entity.manager.Collector.builder()
+
.name(identity).ip("127.0.0.1").mode("public").version("1.0.0").status(CommonConstants.COLLECTOR_STATUS_OFFLINE).build();
+
when(collectorDao.findCollectorByName(identity)).thenReturn(Optional.of(collector));
+
+ CollectorMonitorBind bind =
CollectorMonitorBind.builder().collector(identity).monitorId(1L).build();
+
when(collectorMonitorBindDao.findCollectorMonitorBindsByCollector(identity)).thenReturn(List.of(bind));
+
+ Monitor monitor =
Monitor.builder().id(1L).name("test-monitor").instance("127.0.0.1:8080").app("test-app")
+ .intervals(60).status((byte)
1).scheduleType("cron").cronExpression("0 55 7 * * ?").build();
+
when(monitorDao.findMonitorsByIdIn(any())).thenReturn(List.of(monitor));
+
+
when(paramDao.findParamsByMonitorId(eq(monitor.getId()))).thenReturn(List.of());
+
+ Job appDefine = new Job();
+ appDefine.setParams(Collections.emptyList());
+ when(appService.getAppDefine(anyString())).thenReturn(appDefine);
+
+ ConsistentHash.Node node = new ConsistentHash.Node(identity,
collector.getMode(),
+ collector.getIp(), System.currentTimeMillis(), null);
+ when(consistentHash.getNode("collector-1")).thenReturn(node);
+
+ ManageServer manageServer = mock(ManageServer.class);
+ collectorJobScheduler.setManageServer(manageServer);
+
+ collectorJobScheduler.collectorGoOnline(identity, collectorInfo);
+
+ ArgumentCaptor<ClusterMsg.Message> msgCaptor =
ArgumentCaptor.forClass(ClusterMsg.Message.class);
+ verify(manageServer, atLeastOnce()).sendMsg(eq("collector-1"),
msgCaptor.capture());
+ Job job =
JsonUtil.fromJson(msgCaptor.getValue().getMsg().toStringUtf8(), Job.class);
+ assertNotNull(job);
+ assertEquals("cron", job.getScheduleType());
+ assertEquals("0 55 7 * * ?", job.getCronExpression());
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
