Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ protected static class Cluster {
int[] serverIndexToRackIndex; //serverIndex -> rack index

int[][] regionsPerServer; //serverIndex -> region list
int[] serverIndexToRegionsOffset; //serverIndex -> offset of region list
int[][] regionsPerHost; //hostIndex -> list of regions
int[][] regionsPerRack; //rackIndex -> region list
int[][] primariesOfRegionsPerServer; //serverIndex -> sorted list of regions by primary region index
Expand Down Expand Up @@ -276,6 +277,7 @@ protected Cluster(
serverIndexToHostIndex = new int[numServers];
serverIndexToRackIndex = new int[numServers];
regionsPerServer = new int[numServers][];
serverIndexToRegionsOffset = new int[numServers];
regionsPerHost = new int[numHosts][];
regionsPerRack = new int[numRacks][];
primariesOfRegionsPerServer = new int[numServers][];
Expand Down Expand Up @@ -321,7 +323,7 @@ protected Cluster(

for (Entry<ServerName, List<RegionInfo>> entry : clusterState.entrySet()) {
int serverIndex = serversToIndex.get(entry.getKey().getHostAndPort());
regionPerServerIndex = 0;
regionPerServerIndex = serverIndexToRegionsOffset[serverIndex];

int hostIndex = hostsToIndex.get(entry.getKey().getHostname());
serverIndexToHostIndex[serverIndex] = hostIndex;
Expand All @@ -334,6 +336,7 @@ protected Cluster(
regionsPerServer[serverIndex][regionPerServerIndex++] = regionIndex;
regionIndex++;
}
serverIndexToRegionsOffset[serverIndex] = regionPerServerIndex;
}

for (RegionInfo region : unassignedRegions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public void testClusterServersWithSameHostPort() {
// sharing same host and port
List<ServerName> servers = getListOfServerNames(randomServers(10, 10));
List<RegionInfo> regions = randomRegions(101);
Map<ServerName, List<RegionInfo>> clusterState = new HashMap<>();
Map<ServerName, List<RegionInfo>> clusterState = new TreeMap<>();

assignRegions(regions, servers, clusterState);

Expand All @@ -491,6 +491,13 @@ public void testClusterServersWithSameHostPort() {
BaseLoadBalancer.Cluster cluster = new Cluster(clusterState, null, null, null);
assertEquals(101 + 9, cluster.numRegions);
assertEquals(10, cluster.numServers); // only 10 servers because they share the same host + port

// test move
ServerName sn = oldServers.get(0);
int r0 = ArrayUtils.indexOf(cluster.regions, clusterState.get(sn).get(0));
int f0 = cluster.serversToIndex.get(sn.getHostAndPort());
int t0 = cluster.serversToIndex.get(servers.get(1).getHostAndPort());
cluster.doAction(new MoveRegionAction(r0, f0, t0));
}

private void assignRegions(List<RegionInfo> regions, List<ServerName> servers,
Expand Down