From 1808c3078628865cd92d892d36a2d9b4121772b1 Mon Sep 17 00:00:00 2001 From: v-zhangjc9 Date: Thu, 25 Apr 2024 18:23:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(scheduler):=20=E5=A2=9E=E5=8A=A0=E8=A1=A8?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=8E=8B=E7=BC=A9?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BD=86=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lanyuanxiaoyao/service/common/Constants.java | 1 + .../lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java | 2 ++ service-web/src/main/resources/static/components/common.js | 1 + 3 files changed, 4 insertions(+) diff --git a/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java b/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java index 37c3a16..4849988 100644 --- a/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java +++ b/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java @@ -186,6 +186,7 @@ public interface Constants { String LOG_POINT_FIELD_TYPE_NOT_FOUND = LOG_POINT_PREFIX + "000006"; String TAGS_NO_COMPACT = "NO_COMPACT"; + String TAGS_NO_SCHEDULE_COMPACT = "NO_SCHEDULE_COMPACT"; String TAGS_PULSAR_BACKUP = "PULSAR_BACKUP"; String TAGS_NO_PRE_COMBINE = "NO_PRE_COMBINE"; String TAGS_PRE_COMBINE = "PRE_COMBINE"; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java index 5394748..c6b8539 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java @@ -72,6 +72,8 @@ public class ScheduleHelper { }) // 拒绝不压缩标志的任务 .reject(meta -> TableMetaHelper.existsTag(meta, Constants.TAGS_NO_COMPACT)) + // 拒绝不调度压缩标志的任务 + .reject(meta -> TableMetaHelper.existsTag(meta, Constants.TAGS_NO_SCHEDULE_COMPACT)) .collect(meta -> { long compactionDuration = 0L; try { diff --git a/service-web/src/main/resources/static/components/common.js b/service-web/src/main/resources/static/components/common.js index 72543d2..543e81a 100644 --- a/service-web/src/main/resources/static/components/common.js +++ b/service-web/src/main/resources/static/components/common.js @@ -1889,6 +1889,7 @@ let compactionStatusMapping = [ let tagsMapping = [ mappingItem('不压缩', 'NO_COMPACT'), + mappingItem('不调度压缩', 'NO_SCHEDULE_COMPACT'), mappingItem('备份Pulsar消息', 'PULSAR_BACKUP'), mappingItem('无预合并', 'NO_PRE_COMBINE'), mappingItem('不忽略写日志错误', 'NO_IGNORE_FAILED'),