From ae9dd6f3d3b10664dec7aaf8e531f46fafc216db Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@foxmail.com>
Date: Tue, 29 Jul 2025 14:49:50 +0800
Subject: [PATCH] Fix the problem that synchronizer might be started multiple
 times (#7642)

#### What type of PR is this?

/kind bug
/area core
/milestone 2.21.x

#### What this PR does / why we need it:

This PR fixes the problem of starting synchronizer multiple times while configuring multiple workers.

#### Does this PR introduce a user-facing change?

```release-note
None
```
---
 .../extension/controller/DefaultController.java   |  6 +++---
 .../controller/DefaultControllerTest.java         | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/api/src/main/java/run/halo/app/extension/controller/DefaultController.java b/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
index b3bdf9dfa..d02279f26 100644
--- a/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
+++ b/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
@@ -135,6 +135,9 @@ public class DefaultController<R> implements Controller {
             return;
         }
         this.started = true;
+        if (synchronizer != null) {
+            synchronizer.start();
+        }
         log.info("Starting controller {}", name);
         IntStream.range(0, getWorkerCount())
             .mapToObj(i -> new Worker())
@@ -162,9 +165,6 @@ public class DefaultController<R> implements Controller {
         @Override
         public void run() {
             log.info("Controller worker {} started", this.name);
-            if (synchronizer != null) {
-                synchronizer.start();
-            }
             while (!isDisposed() && !Thread.currentThread().isInterrupted()) {
                 try {
                     var entry = queue.take();
diff --git a/api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java b/api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java
index 476f1c7be..38b7617b1 100644
--- a/api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java
+++ b/api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java
@@ -91,7 +91,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer, times(1)).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue, times(0)).add(any());
             verify(queue, times(1)).done(any());
@@ -109,7 +109,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer, times(1)).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue, times(1)).done(any());
             verify(queue, times(1)).add(argThat(de ->
@@ -129,7 +129,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer, times(1)).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue, times(1)).done(any());
             verify(queue, times(1)).add(argThat(de ->
@@ -150,7 +150,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue).done(any());
             verify(queue).add(argThat(de ->
@@ -171,7 +171,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue).done(any());
 
@@ -190,7 +190,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer, times(1)).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue, times(1)).done(any());
             verify(queue, times(1)).add(argThat(de ->
@@ -211,7 +211,7 @@ class DefaultControllerTest {
 
             controller.new Worker().run();
 
-            verify(synchronizer, times(1)).start();
+            verify(synchronizer, never()).start();
             verify(queue, times(2)).take();
             verify(queue, times(1)).done(any());
             verify(queue, times(1)).add(argThat(de ->
@@ -262,6 +262,7 @@ class DefaultControllerTest {
         assertTrue(controller.isStarted());
         assertFalse(controller.isDisposed());
 
+        verify(synchronizer).start();
         verify(executor).execute(any(Runnable.class));
     }