Skip to content

Commit 709dfe2

Browse files
authored
[1.3.6-prepare][Fix-5351][K8s] Fix quartz cron task cannot take effect in K8s #5353 (#5354)
1 parent 2cfa0a2 commit 709dfe2

File tree

4 files changed

+40
-2
lines changed

4 files changed

+40
-2
lines changed

Diff for: sql/dolphinscheduler_mysql.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ CREATE TABLE `QRTZ_CRON_TRIGGERS` (
7474
DROP TABLE IF EXISTS `QRTZ_FIRED_TRIGGERS`;
7575
CREATE TABLE `QRTZ_FIRED_TRIGGERS` (
7676
`SCHED_NAME` varchar(120) NOT NULL,
77-
`ENTRY_ID` varchar(95) NOT NULL,
77+
`ENTRY_ID` varchar(200) NOT NULL,
7878
`TRIGGER_NAME` varchar(200) NOT NULL,
7979
`TRIGGER_GROUP` varchar(200) NOT NULL,
8080
`INSTANCE_NAME` varchar(200) NOT NULL,

Diff for: sql/dolphinscheduler_postgre.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ alter table QRTZ_PAUSED_TRIGGER_GRPS add primary key(SCHED_NAME,TRIGGER_GROUP);
114114

115115
CREATE TABLE QRTZ_FIRED_TRIGGERS (
116116
SCHED_NAME character varying(120) NOT NULL,
117-
ENTRY_ID character varying(95) NOT NULL,
117+
ENTRY_ID character varying(200) NOT NULL,
118118
TRIGGER_NAME character varying(200) NOT NULL,
119119
TRIGGER_GROUP character varying(200) NOT NULL,
120120
INSTANCE_NAME character varying(200) NOT NULL,

Diff for: sql/upgrade/1.3.6_schema/mysql/dolphinscheduler_ddl.sql

+20
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,23 @@ d//
3838
delimiter ;
3939
CALL uc_dolphin_T_t_ds_worker_group_R_ip_list;
4040
DROP PROCEDURE uc_dolphin_T_t_ds_worker_group_R_ip_list;
41+
42+
-- uc_dolphin_T_qrtz_fired_triggers_R_entry_id
43+
drop PROCEDURE if EXISTS uc_dolphin_T_qrtz_fired_triggers_R_entry_id;
44+
delimiter d//
45+
CREATE PROCEDURE uc_dolphin_T_qrtz_fired_triggers_R_entry_id()
46+
BEGIN
47+
IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
48+
WHERE TABLE_NAME='QRTZ_FIRED_TRIGGERS'
49+
AND TABLE_SCHEMA=(SELECT DATABASE())
50+
AND COLUMN_NAME ='entry_id')
51+
THEN
52+
ALTER TABLE QRTZ_FIRED_TRIGGERS MODIFY COLUMN `entry_id` varchar(200);
53+
END IF;
54+
END;
55+
56+
d//
57+
58+
delimiter ;
59+
CALL uc_dolphin_T_qrtz_fired_triggers_R_entry_id;
60+
DROP PROCEDURE uc_dolphin_T_qrtz_fired_triggers_R_entry_id;

Diff for: sql/upgrade/1.3.6_schema/postgresql/dolphinscheduler_ddl.sql

+18
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,24 @@ delimiter ;
3636
SELECT uc_dolphin_T_t_ds_worker_group_A_ip_list();
3737
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_worker_group_A_ip_list();
3838

39+
-- uc_dolphin_T_qrtz_fired_triggers_A_entry_id
40+
delimiter d//
41+
CREATE OR REPLACE FUNCTION uc_dolphin_T_qrtz_fired_triggers_A_entry_id() RETURNS void AS $$
42+
BEGIN
43+
IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
44+
WHERE TABLE_NAME='qrtz_fired_triggers'
45+
AND COLUMN_NAME ='entry_id')
46+
THEN
47+
ALTER TABLE qrtz_fired_triggers ALTER COLUMN entry_id type varchar(200);
48+
END IF;
49+
END;
50+
$$ LANGUAGE plpgsql;
51+
d//
52+
53+
delimiter ;
54+
SELECT uc_dolphin_T_qrtz_fired_triggers_A_entry_id();
55+
DROP FUNCTION IF EXISTS uc_dolphin_T_qrtz_fired_triggers_A_entry_id();
56+
3957
-- Add foreign key constraints for t_ds_task_instance --
4058
delimiter ;
4159
ALTER TABLE t_ds_task_instance ADD CONSTRAINT foreign_key_instance_id FOREIGN KEY(process_instance_id) REFERENCES t_ds_process_instance(id) ON DELETE CASCADE;

0 commit comments

Comments
 (0)