From 7179cc34a7b53d4b34678447514846b772179931 Mon Sep 17 00:00:00 2001 From: wangwei Date: Thu, 21 May 2020 22:03:16 +0800 Subject: [PATCH 1/2] [ISSUE #2749]dumpAllTaskMgr did not add the correct processor rebase develop --- .../nacos/config/server/service/dump/DumpService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java index d30f16797..03b57fd99 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java @@ -120,6 +120,10 @@ public class DumpService { dumpAllTaskMgr = new TaskManager("com.alibaba.nacos.server.DumpAllTaskManager"); dumpAllTaskMgr.setDefaultTaskProcessor(dumpAllProcessor); + dumpAllTaskMgr.addProcessor(DumpAllTask.TASK_ID, dumpAllProcessor); + dumpAllTaskMgr.addProcessor(DumpAllBetaTask.TASK_ID, dumpAllBetaProcessor); + dumpAllTaskMgr.addProcessor(DumpAllTagTask.TASK_ID, dumpAllTagProcessor); + // If using embedded distributed storage, you need to wait for the // underlying master to complete the selection if (PropertyUtil.isEmbeddedStorage() && !ApplicationUtils.getStandaloneMode()) { @@ -196,6 +200,9 @@ public class DumpService { Runnable dumpAllBeta = () -> dumpAllTaskMgr .addTask(DumpAllBetaTask.TASK_ID, new DumpAllBetaTask()); + Runnable dumpAllTag = () -> dumpAllTaskMgr + .addTask(DumpAllTagTask.TASK_ID, new DumpAllTagTask()); + Runnable clearConfigHistory = () -> { log.warn("clearConfigHistory start"); if (canExecute()) { @@ -285,6 +292,9 @@ public class DumpService { TimerTaskService.scheduleWithFixedDelay(dumpAllBeta, initialDelay, DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); + + TimerTaskService.scheduleWithFixedDelay(dumpAllTag, initialDelay, + DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); } TimerTaskService From dc0c5375a822b699c29f3599670e7f4323e935a1 Mon Sep 17 00:00:00 2001 From: wangwei Date: Wed, 3 Jun 2020 11:25:41 +0800 Subject: [PATCH 2/2] Merge remote-tracking branch 'alibaba/develop' into issue_2749 --- .../nacos/config/server/service/dump/DumpService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java index 4a6f5a1b6..5a1d8b573 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java @@ -131,7 +131,7 @@ public abstract class DumpService { .addTask(DumpAllBetaTask.TASK_ID, new DumpAllBetaTask()); Runnable dumpAllTag = () -> dumpAllTaskMgr - .addTask(DumpAllTagTask.TASK_ID, new DumpAllTagTask()); + .addTask(DumpAllTagTask.TASK_ID, new DumpAllTagTask()); Runnable clearConfigHistory = () -> { log.warn("clearConfigHistory start"); @@ -221,10 +221,10 @@ public abstract class DumpService { DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); ConfigExecutor.scheduleWithFixedDelay(dumpAllBeta, initialDelay, - DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); + DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); ConfigExecutor.scheduleWithFixedDelay(dumpAllTag, initialDelay, - DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); + DUMP_ALL_INTERVAL_IN_MINUTE, TimeUnit.MINUTES); } ConfigExecutor