Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20229 ConnectionImplementation.locateRegions() returns duplicated entries when region replication is on

This commit is contained in:
Toshihiro Suzuki 2018-03-26 15:03:45 -07:00 committed by Huaxiang Sun
parent 5b2d2de8f9
commit ff5250ca2b
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
View File

@ -672,6 +672,9 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
} }
List<HRegionLocation> locations = new ArrayList<>(); List<HRegionLocation> locations = new ArrayList<>();
for (RegionInfo regionInfo : regions) { for (RegionInfo regionInfo : regions) {
if (!RegionReplicaUtil.isDefaultReplica(regionInfo)) {
continue;
}
RegionLocations list = locateRegion(tableName, regionInfo.getStartKey(), useCache, true); RegionLocations list = locateRegion(tableName, regionInfo.getStartKey(), useCache, true);
if (list != null) { if (list != null) {
for (HRegionLocation loc : list.getRegionLocations()) { for (HRegionLocation loc : list.getRegionLocations()) {

36
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnectionImplementation.java
View File

@ -29,6 +29,7 @@ import java.lang.reflect.Modifier;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue; import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
@ -37,6 +38,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseClassTestRule;
@ -1044,4 +1048,36 @@ public class TestConnectionImplementation {
table.close(); table.close();
connection.close(); connection.close();
} }
@Test
public void testLocateRegionsWithRegionReplicas() throws IOException {
int regionReplication = 3;
byte[] family = Bytes.toBytes("cf");
TableName tableName = TableName.valueOf(name.getMethodName());
// Create a table with region replicas
TableDescriptorBuilder builder = TableDescriptorBuilder
.newBuilder(tableName)
.setRegionReplication(regionReplication)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family));
TEST_UTIL.getAdmin().createTable(builder.build());
try (ConnectionImplementation con = (ConnectionImplementation) ConnectionFactory.
createConnection(TEST_UTIL.getConfiguration())) {
// Get locations of the regions of the table
List<HRegionLocation> locations = con.locateRegions(tableName, false, false);
// The size of the returned locations should be 3
assertEquals(regionReplication, locations.size());
// The replicaIds of the returned locations should be 0, 1 and 2
Set<Integer> expectedReplicaIds = IntStream.range(0, regionReplication).
boxed().collect(Collectors.toSet());
for (HRegionLocation location : locations) {
assertTrue(expectedReplicaIds.remove(location.getRegion().getReplicaId()));
}
} finally {
TEST_UTIL.deleteTable(tableName);
}
}
} }