From 518e8769552b274c10cc96e8b13d8a32b872e236 Mon Sep 17 00:00:00 2001 From: Aloys Zhang Date: Thu, 4 Jul 2024 20:26:30 +0800 Subject: [PATCH] [INLONG-10566][Manager] fix auth failed and cronexpression field type --- .../manager/dao/entity/ScheduleEntity.java | 4 ++-- .../manager/pojo/group/InlongGroupInfo.java | 8 +++---- .../pojo/group/InlongGroupRequest.java | 8 +++---- .../manager/pojo/schedule/ScheduleInfo.java | 4 ++-- .../pojo/schedule/ScheduleInfoRequest.java | 4 ++-- .../inlong/manager/schedule/ScheduleUnit.java | 2 +- .../schedule/quartz/QuartzScheduleEngine.java | 12 +++++----- .../manager/schedule/util/ScheduleUtils.java | 6 ++--- .../manager/schedule/BaseScheduleTest.java | 2 +- .../{MockJob.java => MockQuartzJob.java} | 8 ++++--- .../quartz/QuartzScheduleEngineTest.java | 24 +++++++++---------- .../schedule/util/ScheduleUtilsTest.java | 14 ++++++----- .../GroupScheduleResourceListener.java | 2 +- .../resources/h2/apache_inlong_manager.sql | 2 +- .../manager-web/sql/apache_inlong_manager.sql | 2 +- .../manager-web/sql/changes-1.13.0.sql | 2 +- .../src/test/resources/application.properties | 7 ------ 17 files changed, 54 insertions(+), 57 deletions(-) rename inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/{MockJob.java => MockQuartzJob.java} (83%) diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java index b2d49cd43c6..6d301703fcc 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java @@ -33,8 +33,8 @@ public class ScheduleEntity implements Serializable { private String inlongGroupId; // schedule type, support [normal, crontab], 0 for normal and 1 for crontab private Integer scheduleType; - // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneway] - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround private String scheduleUnit; private Integer scheduleInterval; // schedule start time, long type timestamp diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java index 0fb04791966..75fd9f35b93 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java @@ -142,8 +142,8 @@ public abstract class InlongGroupInfo extends BaseInlongGroup { @ApiModelProperty("Schedule type") private Integer scheduleType; - // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneway] - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround @ApiModelProperty("TimeUnit for schedule interval") private String scheduleUnit; @@ -165,8 +165,8 @@ public abstract class InlongGroupInfo extends BaseInlongGroup { @ApiModelProperty("Schedule task parallelism") private Integer taskParallelism; - @ApiModelProperty("Schedule task parallelism") - private Integer crontabExpression; + @ApiModelProperty("Cron expression") + private String crontabExpression; public abstract InlongGroupRequest genRequest(); diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java index 1adc210a0a0..1749d1427cb 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java @@ -135,8 +135,8 @@ public abstract class InlongGroupRequest extends BaseInlongGroup { @ApiModelProperty("Schedule type") private Integer scheduleType; - // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneway] - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround @ApiModelProperty("TimeUnit for schedule interval") private String scheduleUnit; @@ -158,7 +158,7 @@ public abstract class InlongGroupRequest extends BaseInlongGroup { @ApiModelProperty("Schedule task parallelism") private Integer taskParallelism; - @ApiModelProperty("Schedule task parallelism") - private Integer crontabExpression; + @ApiModelProperty("Cron expression") + private String crontabExpression; } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java index 0bc8d2e6dbb..bb4fb2ca41b 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java @@ -50,8 +50,8 @@ public class ScheduleInfo { @ApiModelProperty("Schedule type") private Integer scheduleType; - // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneway] - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround @ApiModelProperty("TimeUnit for schedule interval") private String scheduleUnit; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java index 7e81f7533fa..bf6fb298bf1 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java @@ -44,8 +44,8 @@ public class ScheduleInfoRequest { @ApiModelProperty("Schedule type") private Integer scheduleType; - // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneway] - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround @ApiModelProperty("TimeUnit for schedule interval") private String scheduleUnit; diff --git a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/ScheduleUnit.java b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/ScheduleUnit.java index f4f0a766d85..1a5a4cf66d6 100644 --- a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/ScheduleUnit.java +++ b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/ScheduleUnit.java @@ -29,7 +29,7 @@ public enum ScheduleUnit { HOUR("H"), MINUTE("I"), SECOND("S"), - ONE_WAY("O"); + ONE_ROUND("O"); final String unit; diff --git a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngine.java b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngine.java index 58f6e7c1768..4715537fa48 100644 --- a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngine.java +++ b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngine.java @@ -57,11 +57,11 @@ public class QuartzScheduleEngine implements ScheduleEngine { @Value("${server.port:8083}") private int port; - @Value("${inlong.inner.secrete.id:admin}") - private String secretId; + @Value("${default.admin.user:admin}") + private String username; - @Value("${inlong.inner.secrete.key:87haw3VYTPqK5fK0}") - private String secretKey; + @Value("${default.admin.password:inlong}") + private String password; private final Scheduler scheduler; private final Set scheduledJobSet = new HashSet<>(); @@ -83,7 +83,7 @@ public void start() { scheduler.getListenerManager().addSchedulerListener(new QuartzSchedulerListener(this)); scheduler.start(); LOGGER.info("Quartz scheduler engine started, inlong manager host {}, port {}, secretId {}", - host, port, secretId); + host, port, username); } catch (SchedulerException e) { throw new QuartzScheduleException("Failed to start quartz scheduler ", e); } @@ -112,7 +112,7 @@ public boolean handleRegister(ScheduleInfo scheduleInfo, Class cl if (scheduledJobSet.contains(scheduleInfo.getInlongGroupId())) { throw new QuartzScheduleException("Group " + scheduleInfo.getInlongGroupId() + " is already registered"); } - JobDetail jobDetail = genQuartzJobDetail(scheduleInfo, clz, host, port, secretId, secretKey); + JobDetail jobDetail = genQuartzJobDetail(scheduleInfo, clz, host, port, username, password); Trigger trigger = genQuartzTrigger(jobDetail, scheduleInfo); try { scheduler.scheduleJob(jobDetail, trigger); diff --git a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/util/ScheduleUtils.java b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/util/ScheduleUtils.java index 2cd2a80b39b..50c5d9505fa 100644 --- a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/util/ScheduleUtils.java +++ b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/util/ScheduleUtils.java @@ -98,7 +98,7 @@ public static Trigger genQuartzTrigger(JobDetail jobDetail, ScheduleInfo schedul } } - // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway + // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround public static ScheduleBuilder genSimpleQuartzScheduleBuilder(int interval, String scheduleUnit) { if (StringUtils.isBlank(scheduleUnit)) { throw new QuartzScheduleException("Schedule unit cannot be empty"); @@ -143,11 +143,11 @@ public static ScheduleBuilder genSimpleQuartzScheduleBuilder(int .simpleSchedule() .withIntervalInSeconds(interval) .repeatForever(); - case ONE_WAY: + case ONE_ROUND: return SimpleScheduleBuilder .simpleSchedule() .withIntervalInSeconds(interval) - .withRepeatCount(1); + .withRepeatCount(0); default: throw new QuartzScheduleException("Not supported schedule interval" + scheduleUnit); } diff --git a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/BaseScheduleTest.java b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/BaseScheduleTest.java index a6eb129d5ad..1f0329a318b 100644 --- a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/BaseScheduleTest.java +++ b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/BaseScheduleTest.java @@ -107,7 +107,7 @@ protected long calculateScheduleTimes(ScheduleInfo scheduleInfo, boolean isCron) return timeSpanInMs / 1000 / 60 / interval; case SECOND: return timeSpanInMs / 1000 / interval; - case ONE_WAY: + case ONE_ROUND: return 1; default: return 0; diff --git a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockJob.java b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockQuartzJob.java similarity index 83% rename from inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockJob.java rename to inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockQuartzJob.java index bc0fecf99a3..4f56f8fdff1 100644 --- a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockJob.java +++ b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/MockQuartzJob.java @@ -26,9 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -public class MockJob implements Job { +public class MockQuartzJob implements Job { - private static final Logger LOGGER = LoggerFactory.getLogger(MockJob.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MockQuartzJob.class); public static CountDownLatch countDownLatch; private static AtomicInteger counter = new AtomicInteger(0); @@ -38,7 +38,9 @@ public void execute(JobExecutionContext context) throws JobExecutionException { if (countDownLatch.getCount() > 0) { countDownLatch.countDown(); } - LOGGER.info("MockJob executed " + counter.incrementAndGet()); + LOGGER.info("MockJob executed {} times ", counter.incrementAndGet()); + LOGGER.info("Fire time: {}, previous fire time: {} next fire time: {}", + context.getScheduledFireTime(), context.getPreviousFireTime(), context.getNextFireTime()); } public static void setCount(int count) { diff --git a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngineTest.java b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngineTest.java index 11e7580f289..041b6d2c4a6 100644 --- a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngineTest.java +++ b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/quartz/QuartzScheduleEngineTest.java @@ -59,15 +59,15 @@ private void testRegister(ScheduleInfo scheduleInfo, boolean isCrontab) throws E // cal total schedule times long expectCount = calculateScheduleTimes(scheduleInfo, isCrontab); // set countdown latch - MockJob.setCount((int) expectCount); + MockQuartzJob.setCount((int) expectCount); // register schedule info - scheduleEngine.handleRegister(scheduleInfo, MockJob.class); + scheduleEngine.handleRegister(scheduleInfo, MockQuartzJob.class); // check job exist assertEquals(1, scheduleEngine.getScheduledJobSet().size()); JobKey jobKey = new JobKey(scheduleInfo.getInlongGroupId()); boolean exist = scheduleEngine.getScheduler().checkExists(jobKey); assertTrue(exist); - MockJob.countDownLatch.await(); + MockQuartzJob.countDownLatch.await(); // not job exist after scheduled await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> { @@ -92,15 +92,15 @@ private void testUnRegister(ScheduleInfo scheduleInfo, boolean isCrontab) throws // cal total schedule times long expectCount = calculateScheduleTimes(scheduleInfo, isCrontab); - MockJob.setCount((int) (expectCount / 2)); + MockQuartzJob.setCount((int) (expectCount / 2)); // register schedule info - scheduleEngine.handleRegister(scheduleInfo, MockJob.class); + scheduleEngine.handleRegister(scheduleInfo, MockQuartzJob.class); // check job exist assertEquals(1, scheduleEngine.getScheduledJobSet().size()); JobKey jobKey = new JobKey(scheduleInfo.getInlongGroupId()); boolean exist = scheduleEngine.getScheduler().checkExists(jobKey); assertTrue(exist); - MockJob.countDownLatch.await(); + MockQuartzJob.countDownLatch.await(); // un-register before trigger finalized scheduleEngine.handleUnregister(scheduleInfo.getInlongGroupId()); @@ -130,27 +130,27 @@ public void testUpdate(ScheduleInfo scheduleInfo, ScheduleInfo scheduleInfoToUpd throws Exception { // cal total schedule times long expectCount = calculateScheduleTimes(scheduleInfo, isCrontab); - MockJob.setCount((int) (expectCount / 2)); + MockQuartzJob.setCount((int) (expectCount / 2)); // register schedule info - scheduleEngine.handleRegister(scheduleInfo, MockJob.class); + scheduleEngine.handleRegister(scheduleInfo, MockQuartzJob.class); // check job exist assertEquals(1, scheduleEngine.getScheduledJobSet().size()); JobKey jobKey = new JobKey(scheduleInfo.getInlongGroupId()); boolean exist = scheduleEngine.getScheduler().checkExists(jobKey); assertTrue(exist); - MockJob.countDownLatch.await(); + MockQuartzJob.countDownLatch.await(); // update schedule before trigger finalized expectCount = calculateScheduleTimes(scheduleInfoToUpdate, isCrontab); - MockJob.setCount((int) expectCount); - scheduleEngine.handleUpdate(scheduleInfoToUpdate, MockJob.class); + MockQuartzJob.setCount((int) expectCount); + scheduleEngine.handleUpdate(scheduleInfoToUpdate, MockQuartzJob.class); // job scheduled after updated assertEquals(1, scheduleEngine.getScheduledJobSet().size()); exist = scheduleEngine.getScheduler().checkExists(jobKey); assertTrue(exist); - MockJob.countDownLatch.await(); + MockQuartzJob.countDownLatch.await(); // not job exist after scheduled await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> { diff --git a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/util/ScheduleUtilsTest.java b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/util/ScheduleUtilsTest.java index b515b7ae92c..20e59137a4c 100644 --- a/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/util/ScheduleUtilsTest.java +++ b/inlong-manager/manager-schedule/src/test/java/org/apache/inlong/manager/schedule/util/ScheduleUtilsTest.java @@ -20,7 +20,7 @@ import org.apache.inlong.manager.pojo.schedule.ScheduleInfo; import org.apache.inlong.manager.schedule.BaseScheduleTest; import org.apache.inlong.manager.schedule.exception.QuartzScheduleException; -import org.apache.inlong.manager.schedule.quartz.MockJob; +import org.apache.inlong.manager.schedule.quartz.MockQuartzJob; import org.junit.jupiter.api.Test; import org.quartz.CronScheduleBuilder; @@ -39,7 +39,7 @@ import static org.apache.inlong.manager.schedule.ScheduleUnit.HOUR; import static org.apache.inlong.manager.schedule.ScheduleUnit.MINUTE; import static org.apache.inlong.manager.schedule.ScheduleUnit.MONTH; -import static org.apache.inlong.manager.schedule.ScheduleUnit.ONE_WAY; +import static org.apache.inlong.manager.schedule.ScheduleUnit.ONE_ROUND; import static org.apache.inlong.manager.schedule.ScheduleUnit.WEEK; import static org.apache.inlong.manager.schedule.ScheduleUnit.YEAR; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -76,7 +76,7 @@ public void testGenScheduleBuilder() { assertNotNull(builder); assertInstanceOf(SimpleScheduleBuilder.class, builder); - builder = ScheduleUtils.genSimpleQuartzScheduleBuilder(DEFAULT_INTERVAL, ONE_WAY.getUnit()); + builder = ScheduleUtils.genSimpleQuartzScheduleBuilder(DEFAULT_INTERVAL, ONE_ROUND.getUnit()); assertNotNull(builder); assertInstanceOf(SimpleScheduleBuilder.class, builder); @@ -102,7 +102,8 @@ public void testGenScheduleBuilder() { @Test public void testGenJobDetail() { ScheduleInfo scheduleInfo = genDefaultScheduleInfo(); - JobDetail jobDetail = ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockJob.class, null, null, null, null); + JobDetail jobDetail = + ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockQuartzJob.class, null, null, null, null); assertNotNull(jobDetail); JobKey jobKey = jobDetail.getKey(); @@ -116,7 +117,8 @@ public void testGenJobDetail() { public void testGenCronTrigger() { // normal ScheduleInfo scheduleInfo = genDefaultScheduleInfo(); - JobDetail jobDetail = ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockJob.class, null, null, null, null); + JobDetail jobDetail = + ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockQuartzJob.class, null, null, null, null); Trigger trigger = ScheduleUtils.genQuartzTrigger(jobDetail, scheduleInfo); assertNotNull(trigger); @@ -139,7 +141,7 @@ public void testGenCronTrigger() { // cron scheduleInfo = genDefaultCronScheduleInfo(); - jobDetail = ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockJob.class, null, null, null, null); + jobDetail = ScheduleUtils.genQuartzJobDetail(scheduleInfo, MockQuartzJob.class, null, null, null, null); trigger = ScheduleUtils.genQuartzTrigger(jobDetail, scheduleInfo); assertNotNull(trigger); diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/schedule/GroupScheduleResourceListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/schedule/GroupScheduleResourceListener.java index 8a8848d0447..dfc7584b575 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/schedule/GroupScheduleResourceListener.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/schedule/GroupScheduleResourceListener.java @@ -62,7 +62,7 @@ public boolean accept(WorkflowContext context) { return false; } - log.info("add startup group listener for groupId [{}]", groupId); + log.info("add group schedule resource listener for groupId [{}]", groupId); return InlongConstants.DATASYNC_OFFLINE_MODE.equals(groupProcessForm.getGroupInfo().getInlongGroupMode()); } diff --git a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql index babe5139f8f..8a0bcbf9c92 100644 --- a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql +++ b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql @@ -970,7 +970,7 @@ CREATE TABLE IF NOT EXISTS `schedule_config` `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, undeleted ones cannot be repeated', `schedule_type` int(4) NOT NULL DEFAULT '0' COMMENT 'Schedule type, 0 for normal, 1 for crontab', - `schedule_unit` varchar(64) NOT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway', + `schedule_unit` varchar(64) DEFAULT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround', `schedule_interval` int(11) DEFAULT '1' COMMENT 'Schedule interval', `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Start time for schedule', `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'End time for schedule', diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql index b4458af76f7..dfb6420dc9e 100644 --- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql +++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql @@ -1022,7 +1022,7 @@ CREATE TABLE IF NOT EXISTS `schedule_config` `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, undeleted ones cannot be repeated', `schedule_type` int(4) NOT NULL DEFAULT '0' COMMENT 'Schedule type, 0 for normal, 1 for crontab', - `schedule_unit` varchar(64) NOT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway', + `schedule_unit` varchar(64) DEFAULT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround', `schedule_interval` int(11) DEFAULT '1' COMMENT 'Schedule interval', `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Start time for schedule', `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'End time for schedule', diff --git a/inlong-manager/manager-web/sql/changes-1.13.0.sql b/inlong-manager/manager-web/sql/changes-1.13.0.sql index 6a248ef0a2f..5000782285f 100644 --- a/inlong-manager/manager-web/sql/changes-1.13.0.sql +++ b/inlong-manager/manager-web/sql/changes-1.13.0.sql @@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `schedule_config` `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, undeleted ones cannot be repeated', `schedule_type` int(4) NOT NULL DEFAULT '0' COMMENT 'Schedule type, 0 for normal, 1 for crontab', - `schedule_unit` varchar(64) NOT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneway', + `schedule_unit` varchar(64) DEFAULT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround', `schedule_interval` int(11) DEFAULT '1' COMMENT 'Schedule interval', `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Start time for schedule', `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'End time for schedule', diff --git a/inlong-manager/manager-web/src/test/resources/application.properties b/inlong-manager/manager-web/src/test/resources/application.properties index 014b579fd35..ad0cbd182d8 100644 --- a/inlong-manager/manager-web/src/test/resources/application.properties +++ b/inlong-manager/manager-web/src/test/resources/application.properties @@ -60,10 +60,3 @@ inlong.encrypt.key.value1="I!N@L#O$N%G^" # clients (e.g. agent and dataproxy) must be authenticated by secretId and secretKey if turned on openapi.auth.enabled=false - -# the secreteId and secreteKey for inlong sub-system communication -# used for offline job schedule now: -# 1. when register schedule info, secreteId and secreteKey will be registered to schedule engine -# and the schedule instance will call back to submit offline job with secreteId and secreteKey -inlong.inner.secrete.id=admin -inlong.inner.secrete.key=87haw3VYTPqK5fK0 \ No newline at end of file