Adjust the default ClusterSelector logic

Author: zhanglei28

motan-core/src/main/java/com/weibo/api/motan/cluster/group/DefaultClusterSelector.java

@@ -1,8 +1,6 @@
 package com.weibo.api.motan.cluster.group;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.weibo.api.motan.cluster.Cluster;
 import com.weibo.api.motan.common.MotanConstants;
@@ -15,19 +13,28 @@
 public class DefaultClusterSelector<T> implements ClusterSelector<T>{
     public static final String DEFAULT_ROUTE_GROUP_SANDBOX = "sandbox";
     protected ClusterGroup<T> clusterGroup;
-    protected Map<String, Cluster<T>> routeGroups; // routable cluster groups. 
+    protected Cluster<T> defaultSandboxCluster; // Default sandbox cluster
 
     @Override
     public Cluster<T> select(Request request) {
-        if (routeGroups != null) {
-            // Request-specified route group
+        if (defaultSandboxCluster != null && !CollectionUtil.isEmpty(defaultSandboxCluster.getReferers())) {
+            // Check the route group of the request
             String routeGroup = request.getAttachment(MotanConstants.ROUTE_GROUP_KEY);
             if (routeGroup != null) {
-                Cluster<T> cluster = routeGroups.get(routeGroup.trim());
-                if (cluster != null && !CollectionUtil.isEmpty(cluster.getReferers())) {
-                    // If the cluster has referer, the cluster should be returned.
-                    // If all referers in the cluster are unavailable, an exception should be triggered to make the business aware.
-                    return cluster;
+                routeGroup = routeGroup.trim();
+                // If the route group is sandbox, directly return the default sandbox cluster
+                if (DEFAULT_ROUTE_GROUP_SANDBOX.equals(routeGroup)) {
+                    return defaultSandboxCluster;
+                }
+                
+                // Check the comma-separated group list
+                String[] routeGroupList = routeGroup.split(",");
+                String ownGroup = clusterGroup.getUrl().getGroup();
+                for (String group : routeGroupList) {
+                    group = group.trim();
+                    if (group.equals(ownGroup)) {
+                        return defaultSandboxCluster;
+                    }
                 }
             }
         }
@@ -42,16 +49,10 @@ public void init(ClusterGroup<T> clusterGroup) {
         this.clusterGroup = clusterGroup;
         List<Cluster<T>> sandboxClusters = clusterGroup.getSandboxClusters();
         if (!CollectionUtil.isEmpty(sandboxClusters)) {
-            if (routeGroups == null) {
-                routeGroups = new HashMap<>();
-            }
-            routeGroups.put(DEFAULT_ROUTE_GROUP_SANDBOX, sandboxClusters.get(0)); // The first cluster is the default sandbox cluster
-            for (Cluster<T> cluster : sandboxClusters) {
-                routeGroups.put(cluster.getUrl().getGroup(), cluster);
-            }
+            // Only save the first sandbox cluster as the default sandbox cluster
+            this.defaultSandboxCluster = sandboxClusters.get(0);
         }
     }
-
     @Override
     public void destroy() {
     }

motan-core/src/test/java/com/weibo/api/motan/cluster/group/DefaultClusterSelectorTest.java

@@ -48,12 +48,12 @@ public void testInitWithoutSandboxClusters() {
                 will(returnValue(null));
                 oneOf(clusterGroup).getMasterCluster();
                 will(returnValue(masterCluster));
-            }
+            }    
         });
 
         selector.init(clusterGroup);
         assertSame(clusterGroup, selector.clusterGroup);
-        assertNull(selector.routeGroups);
+        assertNull(selector.defaultSandboxCluster);
 
         Cluster<?> cluster = selector.select(request);
         assertSame(masterCluster, cluster);
@@ -73,7 +73,7 @@ public void testInitWithEmptySandboxClusters() {
 
         selector.init(clusterGroup);
         assertSame(clusterGroup, selector.clusterGroup);
-        assertNull(selector.routeGroups);
+        assertNull(selector.defaultSandboxCluster);
 
         Cluster<?> cluster = selector.select(request);
         assertSame(masterCluster, cluster);
@@ -120,12 +120,8 @@ public void testInitWithSandboxClusters() {
 
         selector.init(clusterGroup);
         assertSame(clusterGroup, selector.clusterGroup);
-        assertNotNull(selector.routeGroups);
-        assertEquals(4, selector.routeGroups.size());
-        assertSame(sandboxCluster, selector.routeGroups.get(DefaultClusterSelector.DEFAULT_ROUTE_GROUP_SANDBOX));
-        assertSame(sandboxCluster, selector.routeGroups.get("testGroup"));
-        assertSame(sandboxCluster2, selector.routeGroups.get("testGroup2"));
-        assertSame(sandboxCluster3, selector.routeGroups.get("testGroup3"));
+        assertNotNull(selector.defaultSandboxCluster);
+        assertSame(sandboxCluster, selector.defaultSandboxCluster);
 
         DefaultRequest defaultRequest = new DefaultRequest();
         // without route group
@@ -139,20 +135,35 @@ public void testInitWithSandboxClusters() {
         assertSame(sandboxCluster, selected);
 
         // with specific sandbox group
+        // Test URL group matching
+        final URL clusterGroupUrl = new URL("motan", "localhost", 8001, "testService");
+        clusterGroupUrl.addParameter("group", "testGroup");
+        
+        mockery.checking(new Expectations() {
+            {
+                allowing(clusterGroup).getUrl();
+                will(returnValue(clusterGroupUrl));
+            }
+        });
+        
         defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, "testGroup");
         selected = selector.select(defaultRequest);
         assertSame(sandboxCluster, selected);
-        defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, "testGroup2");
+        
+        // Test comma-separated group list
+        defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, "otherGroup,testGroup,anotherGroup,  ,,");
         selected = selector.select(defaultRequest);
-        assertSame(sandboxCluster2, selected);
-
-        // with empty referers cluster
-        defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, "testGroup3");
+        assertSame(sandboxCluster, selected);
+        
+        // Test cluster with empty references
+        referers.clear();
+        
         selected = selector.select(defaultRequest);
         assertSame(masterCluster, selected);
 
         // with invalid route group
-        defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, "invalidGroup");
+        referers.add(referer); // referers not empty
+        defaultRequest.setAttachment(MotanConstants.ROUTE_GROUP_KEY, ",, ,invalidGroup");
         selected = selector.select(defaultRequest);
         assertSame(masterCluster, selected);
     }