For alibaba#12526, judge whether cp protocol has init to avoid dead l…

…ock to get cp protocol.
KomachiSion · Sep 2, 2024 · 8171c90 · 8171c90
1 parent 8126d59
commit 8171c90
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/core/src/main/java/com/alibaba/nacos/core/distributed/ProtocolManager.java b/core/src/main/java/com/alibaba/nacos/core/distributed/ProtocolManager.java
@@ -99,6 +99,14 @@ public APProtocol getApProtocol() {
         return apProtocol;
     }
 
+    public boolean isCpInit() {
+        return cpInit;
+    }
+
+    public boolean isApInit() {
+        return apInit;
+    }
+
     @PreDestroy
     @Override
     public void destroy() {

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerStatusManager.java b/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerStatusManager.java
@@ -77,7 +77,7 @@ private boolean isReady() {
         if (!globalConfig.isDataWarmup()) {
             return true;
         }
-        if (protocolManager.getCpProtocol() == null) {
+        if (!protocolManager.isCpInit() || protocolManager.getCpProtocol() == null) {
             return false;
         }
         return protocolManager.getCpProtocol().isReady() && distroProtocol.isInitialized();

diff --git a/naming/src/test/java/com/alibaba/nacos/naming/cluster/ServerStatusManagerTest.java b/naming/src/test/java/com/alibaba/nacos/naming/cluster/ServerStatusManagerTest.java
@@ -85,6 +85,7 @@ void testGetServerStatus() {
 
     @Test
     void testGetErrorMsgForDistroProtocol() {
+        when(protocolManager.isCpInit()).thenReturn(true);
         when(globalConfig.isDataWarmup()).thenReturn(true);
         when(protocolManager.getCpProtocol()).thenReturn(cpProtocol);
         when(distroProtocol.isInitialized()).thenReturn(false);
@@ -95,6 +96,7 @@ void testGetErrorMsgForDistroProtocol() {
 
     @Test
     void testGetErrorMsgForRaft() {
+        when(protocolManager.isCpInit()).thenReturn(true);
         when(globalConfig.isDataWarmup()).thenReturn(true);
         when(protocolManager.getCpProtocol()).thenReturn(cpProtocol);
         when(cpProtocol.isReady()).thenReturn(false);
@@ -137,6 +139,7 @@ void testUpdaterStatusBySwitch() {
 
     @Test
     void testUpdaterStatusForDistroFailed() {
+        when(protocolManager.isCpInit()).thenReturn(true);
         when(globalConfig.isDataWarmup()).thenReturn(true);
         when(protocolManager.getCpProtocol()).thenReturn(cpProtocol);
         ServerStatusManager.ServerStatusUpdater updater = serverStatusManager.new ServerStatusUpdater();
@@ -146,6 +149,7 @@ void testUpdaterStatusForDistroFailed() {
 
     @Test
     void testUpdaterStatusForRaftFailed() {
+        when(protocolManager.isCpInit()).thenReturn(true);
         when(globalConfig.isDataWarmup()).thenReturn(true);
         ServerStatusManager.ServerStatusUpdater updater = serverStatusManager.new ServerStatusUpdater();
         updater.run();
@@ -158,6 +162,7 @@ void testUpdaterStatusForRaftFailed() {
 
     @Test
     void testUpdaterStatus() {
+        when(protocolManager.isCpInit()).thenReturn(true);
         when(globalConfig.isDataWarmup()).thenReturn(true);
         when(protocolManager.getCpProtocol()).thenReturn(cpProtocol);
         when(cpProtocol.isReady()).thenReturn(true);