This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push: new 42f5f09d9be [refactor](sync job) disable sync job by default (#45765) 42f5f09d9be is described below commit 42f5f09d9be8d104ff536c7e5b40e8bced11876a Author: Mingyu Chen (Rayner) <morning...@163.com> AuthorDate: Wed Dec 25 14:50:23 2024 +0800 [refactor](sync job) disable sync job by default (#45765) ### What problem does this PR solve? Problem Summary: `create sync job` feature is no longer maintained, deprecated it by default and remove it in version 3.1. And a new FE config `enable_feature_data_sync_job` ### Release note [refactor](sync job) disable sync job by default --- fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 6 ++++++ .../src/main/java/org/apache/doris/load/sync/SyncJobManager.java | 5 +++++ .../test/java/org/apache/doris/load/sync/SyncJobManagerTest.java | 1 + .../suites/nereids_p0/show/test_show_sync_job_command.groovy | 5 +++++ 4 files changed, 17 insertions(+) diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index 6c6404eac1a..7128bfed900 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -3010,6 +3010,12 @@ public class Config extends ConfigBase { @ConfField(mutable = true, masterOnly = true) public static boolean enable_checkpoint = true; + @ConfField(mutable = true, masterOnly = true, description = { + "是否开启 sync job 功能。默认关闭。该功能将在3.1版本中移除。", + "Whether to enable the sync job feature. It is disabled by default and will be removed in version 3.1." + }) + public static boolean enable_feature_data_sync_job = false; + //========================================================================== // begin of cloud config //========================================================================== diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java index 9455d2c9ea6..f149c5d6670 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java @@ -69,6 +69,11 @@ public class SyncJobManager implements Writable { } public void addDataSyncJob(CreateDataSyncJobStmt stmt) throws DdlException { + if (!Config.enable_feature_data_sync_job) { + throw new DdlException("Data sync job is deprecated and disabled by default. You can enable it by setting " + + "'enable_feature_data_sync_job=true' in fe.conf. " + + "But it's not recommended to use it in production."); + } long jobId = Env.getCurrentEnv().getNextId(); SyncJob syncJob = SyncJob.fromStmt(jobId, stmt); writeLock(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java index dc239dde597..77a71f206bd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java @@ -70,6 +70,7 @@ public class SyncJobManagerTest { @Before public void setUp() throws DdlException { + Config.enable_feature_data_sync_job = true; new Expectations() { { env.getEditLog(); diff --git a/regression-test/suites/nereids_p0/show/test_show_sync_job_command.groovy b/regression-test/suites/nereids_p0/show/test_show_sync_job_command.groovy index 32b460be490..e5999e6bdbe 100644 --- a/regression-test/suites/nereids_p0/show/test_show_sync_job_command.groovy +++ b/regression-test/suites/nereids_p0/show/test_show_sync_job_command.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_show_sync_job_command", "query,sync_job") { + boolean enabled = false; + if (!enabled) { + //sync job is deprecated + return; + } try { sql """CREATE DATABASE IF NOT EXISTS test_db_sync_job;""" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org