jav-479 optimizeLB add filter to distiguish instance enviroment and u…

handlers/handler-loadbalance/src/main/java/io/servicecomb/loadbalance/filter/StageDistinguishFilter.java

@@ -0,0 +1,30 @@
+package io.servicecomb.loadbalance.filter;
+
+import com.netflix.loadbalancer.Server;
+import io.servicecomb.loadbalance.CseServer;
+import io.servicecomb.loadbalance.ServerListFilterExt;
+import io.servicecomb.serviceregistry.RegistryUtils;
+import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.api.registry.MicroserviceInstanceStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StageDistinguishFilter implements ServerListFilterExt {
+    @Override
+    public List<Server> getFilteredListOfServers(List<Server> servers) {
+
+        List<Server> filteredServers = new ArrayList<Server>();
+        for (Server server : servers) {
+            if (allowVisit(server)) {
+                filteredServers.add(server);
+            }
+        }
+        return filteredServers;
+    }
+
+    private boolean allowVisit(Server server) {
+        MicroserviceInstance serInstance = ((CseServer) server).getInstance();
+        return MicroserviceInstanceStatus.UP.equals(serInstance.getStatus()) && RegistryUtils.getMicroserviceInstance().getEnvironment().equals(serInstance.getEnvironment());
+    }
+}

handlers/handler-loadbalance/src/test/java/io/servicecomb/loadbalance/filter/TestStageDistinguishFilter.java

@@ -0,0 +1,84 @@
+package io.servicecomb.loadbalance.filter;
+
+import com.netflix.loadbalancer.Server;
+import io.servicecomb.loadbalance.CseServer;
+import io.servicecomb.serviceregistry.RegistryUtils;
+import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.api.registry.MicroserviceInstanceStatus;
+import mockit.Mock;
+import mockit.MockUp;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class TestStageDistinguishFilter {
+
+    StageDistinguishFilter stageDistinguishFilter = new StageDistinguishFilter();
+
+    MicroserviceInstance microserviceInstance = Mockito.mock(MicroserviceInstance.class);
+
+    @Before
+    public void setUp() throws Exception {
+        Mockito.when(microserviceInstance.getEnvironment()).thenReturn("production");
+        Mockito.when(microserviceInstance.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+        new MockUp<RegistryUtils>() {
+            @Mock
+            public MicroserviceInstance getMicroserviceInstance() {
+                return microserviceInstance;
+            }
+        };
+    }
+
+    @Test
+    public void getFilteredListOfServers_Match() throws Exception {
+        CseServer testServer = Mockito.mock(CseServer.class);
+
+
+        Mockito.when(testServer.getInstance()).thenReturn(microserviceInstance);
+
+
+
+        List<Server> serverList = new ArrayList<Server>();
+        serverList.add(testServer);
+        List<Server> returnedServerList = stageDistinguishFilter.getFilteredListOfServers(serverList);
+        Assert.assertEquals(returnedServerList.size(), 1);
+    }
+
+
+    @Test
+    public void getFilteredListOfServers_Not_Match() throws Exception {
+        CseServer testServer = Mockito.mock(CseServer.class);
+        MicroserviceInstance microserviceInstance1 = Mockito.mock(MicroserviceInstance.class);
+        Mockito.when(microserviceInstance1.getEnvironment()).thenReturn("XXX");
+        Mockito.when(microserviceInstance1.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+        Mockito.when(testServer.getInstance()).thenReturn(microserviceInstance1);
+
+        CseServer testServer1 = Mockito.mock(CseServer.class);
+        MicroserviceInstance microserviceInstance2 = Mockito.mock(MicroserviceInstance.class);
+        Mockito.when(microserviceInstance2.getEnvironment()).thenReturn("production");
+        Mockito.when(microserviceInstance2.getStatus()).thenReturn(MicroserviceInstanceStatus.DOWN);
+        Mockito.when(testServer1.getInstance()).thenReturn(microserviceInstance2);
+
+        List<Server> serverList = new ArrayList<Server>();
+        serverList.add(testServer);
+        serverList.add(testServer1);
+
+        new MockUp<RegistryUtils>() {
+            @Mock
+            public MicroserviceInstance getMicroserviceInstance() {
+                return microserviceInstance;
+            }
+        };
+
+
+        List<Server> returnedServerList = stageDistinguishFilter.getFilteredListOfServers(serverList);
+        Assert.assertEquals(returnedServerList.size(), 0);
+    }
+
+}

service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java

@@ -109,25 +109,20 @@ public void pullInstances() {
     setInstances(pulledInstances);
   }
 
-  private void setInstances(List<MicroserviceInstance> pulledInstances) {
-    synchronized (lock) {
-      instances = pulledInstances
-          .stream()
-          .filter(instance -> {
-            return MicroserviceInstanceStatus.UP.equals(instance.getStatus());
-          })
-          .collect(Collectors.toList());
-      for (MicroserviceInstance instance : instances) {
-        // ensure microserviceVersion exists
-        versions.computeIfAbsent(instance.getServiceId(), microserviceId -> {
-          MicroserviceVersion microserviceVersion =
-              appManager.getMicroserviceVersionFactory().create(microserviceName, microserviceId);
-          for (MicroserviceVersionRule microserviceVersionRule : versionRules.values()) {
-            microserviceVersionRule.addMicroserviceVersion(microserviceVersion);
-          }
-          return microserviceVersion;
-        });
-      }
+    private void setInstances(List<MicroserviceInstance> pulledInstances) {
+        synchronized (lock) {
+            instances = pulledInstances;
+            for (MicroserviceInstance instance : instances) {
+                // ensure microserviceVersion exists
+                versions.computeIfAbsent(instance.getServiceId(), microserviceId -> {
+                    MicroserviceVersion microserviceVersion =
+                            appManager.getMicroserviceVersionFactory().create(microserviceName, microserviceId);
+                    for (MicroserviceVersionRule microserviceVersionRule : versionRules.values()) {
+                        microserviceVersionRule.addMicroserviceVersion(microserviceVersion);
+                    }
+                    return microserviceVersion;
+                });
+            }
 
       for (MicroserviceVersionRule microserviceVersionRule : versionRules.values()) {
         microserviceVersionRule.setInstances(instances);

service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java

@@ -162,17 +162,17 @@ public void setInstancesMatch() {
     Assert.assertSame(instances.get(0), microserviceVersionRule.getInstances().get("i1"));
   }
 
-  @Test
-  public void setInstances_selectUp() {
-    String microserviceId = "1";
-    setup(microserviceId);
-
-    instances.get(0).setStatus(MicroserviceInstanceStatus.DOWN);
-    Deencapsulation.invoke(microserviceVersions, "setInstances", instances);
-
-    List<?> resultInstances = Deencapsulation.getField(microserviceVersions, "instances");
-    Assert.assertTrue(resultInstances.isEmpty());
-  }
+//  @Test
+//  public void setInstances_selectUp() {
+//    String microserviceId = "1";
+//    setup(microserviceId);
+//
+//    instances.get(0).setStatus(MicroserviceInstanceStatus.DOWN);
+//    Deencapsulation.invoke(microserviceVersions, "setInstances", instances);
+//
+//    List<?> resultInstances = Deencapsulation.getField(microserviceVersions, "instances");
+//    Assert.assertTrue(resultInstances.isEmpty());
+//  }
 
   @Test
   public void getOrCreateMicroserviceVersionRule() {