[ISSUE #4320] Fixing the Naming consistency module could not start in cluster mode

naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/PersistentConsistencyServiceDelegateImpl.java

@@ -17,11 +17,15 @@
 package com.alibaba.nacos.naming.consistency.persistent;
 
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.core.distributed.ProtocolManager;
 import com.alibaba.nacos.naming.consistency.Datum;
 import com.alibaba.nacos.naming.consistency.RecordListener;
 import com.alibaba.nacos.naming.consistency.persistent.impl.BasePersistentServiceProcessor;
+import com.alibaba.nacos.naming.consistency.persistent.impl.PersistentServiceProcessor;
+import com.alibaba.nacos.naming.consistency.persistent.impl.StandalonePersistentServiceProcessor;
 import com.alibaba.nacos.naming.consistency.persistent.raft.RaftConsistencyServiceImpl;
 import com.alibaba.nacos.naming.pojo.Record;
+import com.alibaba.nacos.sys.env.EnvUtil;
 import org.springframework.stereotype.Component;
 
 /**
@@ -41,11 +45,11 @@ public class PersistentConsistencyServiceDelegateImpl implements PersistentConsi
     private volatile boolean switchNewPersistentService = false;
 
     public PersistentConsistencyServiceDelegateImpl(ClusterVersionJudgement versionJudgement,
-            RaftConsistencyServiceImpl oldPersistentConsistencyService,
-            BasePersistentServiceProcessor newPersistentConsistencyService) {
+            RaftConsistencyServiceImpl oldPersistentConsistencyService, ProtocolManager protocolManager)
+            throws Exception {
         this.versionJudgement = versionJudgement;
         this.oldPersistentConsistencyService = oldPersistentConsistencyService;
-        this.newPersistentConsistencyService = newPersistentConsistencyService;
+        this.newPersistentConsistencyService = createNewPersistentServiceProcessor(protocolManager, versionJudgement);
         init();
     }
 
@@ -88,4 +92,13 @@ public boolean isAvailable() {
     private PersistentConsistencyService switchOne() {
         return switchNewPersistentService ? newPersistentConsistencyService : oldPersistentConsistencyService;
     }
+
+    private BasePersistentServiceProcessor createNewPersistentServiceProcessor(ProtocolManager protocolManager,
+            ClusterVersionJudgement versionJudgement) throws Exception {
+        final BasePersistentServiceProcessor processor =
+                EnvUtil.getStandaloneMode() ? new StandalonePersistentServiceProcessor(versionJudgement)
+                        : new PersistentServiceProcessor(protocolManager, versionJudgement);
+        processor.afterConstruct();
+        return processor;
+    }
 }

naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/impl/BasePersistentServiceProcessor.java

@@ -121,11 +121,10 @@ public BasePersistentServiceProcessor(final ClusterVersionJudgement judgement) t
                 throw new NacosRuntimeException(ex.getErrCode(), ex.getErrMsg());
             }
         });
-        afterConstruct();
     }
 
     @SuppressWarnings("unchecked")
-    protected void afterConstruct() {
+    public void afterConstruct() {
         NotifyCenter.registerToPublisher(ValueChangeEvent.class, 16384);
         listenOldRaftClose();
     }

naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/impl/PersistentServiceProcessor.java

@@ -35,8 +35,6 @@
 import com.alibaba.nacos.naming.utils.Constants;
 import com.alibaba.nacos.sys.env.EnvUtil;
 import com.google.protobuf.ByteString;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,8 +47,6 @@
  * @author <a href="mailto:[email protected]">liaochuntao</a>
  */
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
-@ConditionalOnProperty(value = "nacos.standalone", havingValue = "false")
-@Service
 public class PersistentServiceProcessor extends BasePersistentServiceProcessor {
 
     private final CPProtocol protocol;
@@ -67,7 +63,7 @@ public PersistentServiceProcessor(ProtocolManager protocolManager, ClusterVersio
     }
 
     @Override
-    protected void afterConstruct() {
+    public void afterConstruct() {
         super.afterConstruct();
         this.protocol.addLogProcessors(Collections.singletonList(this));
         this.protocol.protocolMetaData()

naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/impl/StandalonePersistentServiceProcessor.java

@@ -28,8 +28,6 @@
 import com.alibaba.nacos.naming.pojo.Record;
 import com.alibaba.nacos.naming.utils.Constants;
 import com.google.protobuf.ByteString;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,8 +38,6 @@
  * @author <a href="mailto:[email protected]">liaochuntao</a>
  */
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
-@ConditionalOnProperty(value = "nacos.standalone", havingValue = "true")
-@Service
 public class StandalonePersistentServiceProcessor extends BasePersistentServiceProcessor {
 
     public StandalonePersistentServiceProcessor(final ClusterVersionJudgement judgement) throws Exception {