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

HBASE-20116 addendum fix javadoc and also a simple optimization

This commit is contained in:
zhangduo 2018-03-22 08:31:20 +08:00
parent e2fc21e4a1
commit f346a144b9
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.java
View File

@ -134,26 +134,30 @@ class ZKReplicationQueueStorage extends ZKReplicationStorageBase
} }
/** /**
* <p>
* Put all regions under /hbase/replication/regions znode will lead to too many children because * Put all regions under /hbase/replication/regions znode will lead to too many children because
* of the huge number of regions in real production environment. So here we use hash of encoded * of the huge number of regions in real production environment. So here we will distribute the
* region name to distribute the znode into multiple znodes. <br> * znodes to multiple directories.
* </p>
* <p>
* So the final znode path will be format like this: * So the final znode path will be format like this:
* *
* <pre> * <pre>
* /hbase/replication/regions/e1/ff/dd04e76a6966d4ffa908ed0586764767-100 * /hbase/replication/regions/dd/04/e76a6966d4ffa908ed0586764767-100
* </pre> * </pre>
* *
* The e1 indicate the first level hash of encoded region name, and the ff indicate the second * Here the full encoded region name is dd04e76a6966d4ffa908ed0586764767, and we use the first two
* level hash of encoded region name, the 100 indicate the peer id. <br> * characters 'dd' as the first level directory name, and use the next two characters '04' as the
* Note that here we use two-level hash because if only one-level hash (such as mod 65535), it * second level directory name, and the rest part as the prefix of the znode, and the suffix '100'
* will still lead to too many children under the /hbase/replication/regions znode. * is the peer id.
* </p>
* @param encodedRegionName the encoded region name. * @param encodedRegionName the encoded region name.
* @param peerId peer id for replication. * @param peerId peer id for replication.
* @return ZNode path to persist the max sequence id that we've pushed for the given region and * @return ZNode path to persist the max sequence id that we've pushed for the given region and
* peer. * peer.
*/ */
@VisibleForTesting @VisibleForTesting
public String getSerialReplicationRegionPeerNode(String encodedRegionName, String peerId) { String getSerialReplicationRegionPeerNode(String encodedRegionName, String peerId) {
if (encodedRegionName == null || encodedRegionName.length() != RegionInfo.MD5_HEX_LENGTH) { if (encodedRegionName == null || encodedRegionName.length() != RegionInfo.MD5_HEX_LENGTH) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Invalid encoded region name: " + encodedRegionName + ", length should be 32."); "Invalid encoded region name: " + encodedRegionName + ", length should be 32.");
@ -161,7 +165,7 @@ class ZKReplicationQueueStorage extends ZKReplicationStorageBase
return new StringBuilder(regionsZNode).append(ZNodePaths.ZNODE_PATH_SEPARATOR) return new StringBuilder(regionsZNode).append(ZNodePaths.ZNODE_PATH_SEPARATOR)
.append(encodedRegionName.substring(0, 2)).append(ZNodePaths.ZNODE_PATH_SEPARATOR) .append(encodedRegionName.substring(0, 2)).append(ZNodePaths.ZNODE_PATH_SEPARATOR)
.append(encodedRegionName.substring(2, 4)).append(ZNodePaths.ZNODE_PATH_SEPARATOR) .append(encodedRegionName.substring(2, 4)).append(ZNodePaths.ZNODE_PATH_SEPARATOR)
.append(encodedRegionName).append("-").append(peerId).toString(); .append(encodedRegionName.substring(4)).append("-").append(peerId).toString();
} }
@Override @Override

2
hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationQueueStorage.java
View File

@ -257,7 +257,7 @@ public class TestZKReplicationQueueStorage {
public void testRegionsZNodeLayout() throws Exception { public void testRegionsZNodeLayout() throws Exception {
String peerId = "1"; String peerId = "1";
String encodedRegionName = "31d9792f4435b99d9fb1016f6fbc8dc7"; String encodedRegionName = "31d9792f4435b99d9fb1016f6fbc8dc7";
String expectedPath = "/hbase/replication/regions/31/d9/" + encodedRegionName + "-" + peerId; String expectedPath = "/hbase/replication/regions/31/d9/792f4435b99d9fb1016f6fbc8dc7-" + peerId;
String path = STORAGE.getSerialReplicationRegionPeerNode(encodedRegionName, peerId); String path = STORAGE.getSerialReplicationRegionPeerNode(encodedRegionName, peerId);
Assert.assertEquals(expectedPath, path); Assert.assertEquals(expectedPath, path);
} }