#502 fix bug

alibaba · Mar 4, 2019 · af26af7 · af26af7
1 parent 616a803
commit af26af7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/...rc/main/java/com/alibaba/nacos/naming/consistency/ephemeral/partition/TaskDispatcher.java b/...rc/main/java/com/alibaba/nacos/naming/consistency/ephemeral/partition/TaskDispatcher.java
@@ -94,6 +94,10 @@ public void run() {
                     String key = queue.poll(partitionConfig.getTaskDispatchPeriod(),
                         TimeUnit.MILLISECONDS);
 
+                    if (dataSyncer.getServers() == null || dataSyncer.getServers().isEmpty()) {
+                        continue;
+                    }
+
                     if (dataSize == 0) {
                         keys = new ArrayList<>();
                     }

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
@@ -128,7 +128,6 @@ public String updateSwitch(HttpServletRequest request) throws Exception {
         return "ok";
     }
 
-
     @RequestMapping(value = "/metrics", method = RequestMethod.GET)
     public JSONObject metrics(HttpServletRequest request) {
 

diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java
@@ -52,6 +52,9 @@ public class DeregisterInstance_ITCase {
 
     @Before
     public void init() throws Exception {
+
+        NamingBase.setServerStatusUp(port);
+
         if (naming == null) {
             //TimeUnit.SECONDS.sleep(10);
             naming = NamingFactory.createNamingService("127.0.0.1" + ":" + port);

diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java b/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java
@@ -15,15 +15,16 @@
  */
 package com.alibaba.nacos.test.naming;
 
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.client.naming.net.HttpClient;
+import org.apache.http.HttpStatus;
+import org.junit.Assert;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.nacos.api.naming.pojo.AbstractHealthChecker;
-import com.alibaba.nacos.api.naming.pojo.Cluster;
-import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.api.naming.pojo.Service;
-
 /**
  * @author nkorange
  */
@@ -154,4 +155,15 @@ public static boolean verifyInstanceList(List<Instance> instanceList1, List<Inst
         }
         return true;
     }
+
+    public static void setServerStatusUp(int localPort) {
+        String url = "http://127.0.0.1:" + localPort + "/nacos/v1/ns/operator/switches?entry=overriddenServerStatus&value=UP";
+        List<String> headers = new ArrayList<String>();
+        headers.add("User-Agent");
+        headers.add("Nacos-Server");
+        HttpClient.HttpResult result =
+            HttpClient.request(url, headers, new HashMap<String, String>(), "UTF-8", "PUT");
+
+        Assert.assertEquals(HttpStatus.SC_OK, result.code);
+    }
 }