You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2017/01/31 18:59:09 UTC
hbase git commit: HBASE-17101: FavoredNodes should not apply to
system tables
Repository: hbase
Updated Branches:
refs/heads/master 679182869 -> 680289d67
HBASE-17101: FavoredNodes should not apply to system tables
Signed-off-by: Francis Liu <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/680289d6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/680289d6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/680289d6
Branch: refs/heads/master
Commit: 680289d67deb42922dd244daa11496a4c8a38f80
Parents: 6791828
Author: Thiruvel Thirumoolan <th...@gmail.com>
Authored: Fri Dec 9 02:33:36 2016 -0800
Committer: Francis Liu <to...@apache.org>
Committed: Tue Jan 31 10:58:50 2017 -0800
----------------------------------------------------------------------
.../hbase/favored/FavoredNodeLoadBalancer.java | 5 ++--
.../hbase/favored/FavoredNodesManager.java | 12 ++++++++--
.../hadoop/hbase/master/AssignmentManager.java | 20 ++++++++++++----
.../hbase/regionserver/RSRpcServices.java | 12 ++++++----
.../hbase/client/TestTableFavoredNodes.java | 25 ++++++++++++++++++++
5 files changed, 61 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/680289d6/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
index 99aeede..f0af0d0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
@@ -114,7 +114,7 @@ public class FavoredNodeLoadBalancer extends BaseLoadBalancer implements Favored
currentServer.getPort(), ServerName.NON_STARTCODE);
List<HRegionInfo> list = entry.getValue();
for (HRegionInfo region : list) {
- if(region.getTable().isSystemTable()) {
+ if(!FavoredNodesManager.isFavoredNodeApplicable(region)) {
continue;
}
List<ServerName> favoredNodes = fnm.getFavoredNodes(region);
@@ -209,7 +209,8 @@ public class FavoredNodeLoadBalancer extends BaseLoadBalancer implements Favored
new FavoredNodeAssignmentHelper(servers, rackManager);
assignmentHelper.initialize();
ServerName primary = super.randomAssignment(regionInfo, servers);
- if (!assignmentHelper.canPlaceFavoredNodes()) {
+ if (!FavoredNodesManager.isFavoredNodeApplicable(regionInfo)
+ || !assignmentHelper.canPlaceFavoredNodes()) {
return primary;
}
List<ServerName> favoredNodes = fnm.getFavoredNodes(regionInfo);
http://git-wip-us.apache.org/repos/asf/hbase/blob/680289d6/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
index b055509..5e03997 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
@@ -83,6 +83,14 @@ public class FavoredNodesManager {
return this.globalFavoredNodesAssignmentPlan.getFavoredNodes(regionInfo);
}
+ /*
+ * Favored nodes are not applicable for system tables. We will use this to check before
+ * we apply any favored nodes logic on a region.
+ */
+ public static boolean isFavoredNodeApplicable(HRegionInfo regionInfo) {
+ return !regionInfo.isSystemTable();
+ }
+
public synchronized void updateFavoredNodes(Map<HRegionInfo, List<ServerName>> regionFNMap)
throws IOException {
@@ -99,8 +107,8 @@ public class FavoredNodesManager {
throw new IOException("Duplicates found: " + servers);
}
- if (regionInfo.isSystemTable()) {
- throw new IOException("Can't update FN for system region: "
+ if (!isFavoredNodeApplicable(regionInfo)) {
+ throw new IOException("Can't update FN for a un-applicable region: "
+ regionInfo.getRegionNameAsString() + " with " + servers);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/680289d6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 3005334..61eeb7e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -69,6 +69,7 @@ import org.apache.hadoop.hbase.client.TableState;
import org.apache.hadoop.hbase.executor.EventHandler;
import org.apache.hadoop.hbase.executor.EventType;
import org.apache.hadoop.hbase.executor.ExecutorService;
+import org.apache.hadoop.hbase.favored.FavoredNodesManager;
import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
import org.apache.hadoop.hbase.ipc.FailedServerException;
import org.apache.hadoop.hbase.ipc.RpcClient;
@@ -622,7 +623,7 @@ public class AssignmentManager {
void processFavoredNodesForDaughters(HRegionInfo parent,
HRegionInfo regionA, HRegionInfo regionB) throws IOException {
- if (shouldAssignRegionsWithFavoredNodes) {
+ if (shouldAssignFavoredNodes(parent)) {
List<ServerName> onlineServers = this.serverManager.getOnlineServersList();
((FavoredNodesPromoter) this.balancer).
generateFavoredNodesForDaughter(onlineServers, parent, regionA, regionB);
@@ -631,12 +632,21 @@ public class AssignmentManager {
void processFavoredNodesForMerge(HRegionInfo merged, HRegionInfo regionA, HRegionInfo regionB)
throws IOException {
- if (shouldAssignRegionsWithFavoredNodes) {
+ if (shouldAssignFavoredNodes(merged)) {
((FavoredNodesPromoter)this.balancer).
generateFavoredNodesForMergedRegion(merged, regionA, regionB);
}
}
+ /*
+ * Favored nodes should be applied only when FavoredNodes balancer is configured and the region
+ * belongs to a non-system table.
+ */
+ private boolean shouldAssignFavoredNodes(HRegionInfo region) {
+ return this.shouldAssignRegionsWithFavoredNodes
+ && FavoredNodesManager.isFavoredNodeApplicable(region);
+ }
+
/**
* Marks the region as online. Removes it from regions in transition and
* updates the in-memory assignment information.
@@ -794,7 +804,7 @@ public class AssignmentManager {
regionStates.updateRegionState(
region, State.PENDING_OPEN, destination);
List<ServerName> favoredNodes = ServerName.EMPTY_SERVER_LIST;
- if (this.shouldAssignRegionsWithFavoredNodes) {
+ if (shouldAssignFavoredNodes(region)) {
favoredNodes = server.getFavoredNodesManager().getFavoredNodes(region);
}
regionOpenInfos.add(new Pair<HRegionInfo, List<ServerName>>(
@@ -1102,7 +1112,7 @@ public class AssignmentManager {
" to " + plan.getDestination();
try {
List<ServerName> favoredNodes = ServerName.EMPTY_SERVER_LIST;
- if (this.shouldAssignRegionsWithFavoredNodes) {
+ if (shouldAssignFavoredNodes(region)) {
favoredNodes = server.getFavoredNodesManager().getFavoredNodes(region);
}
serverManager.sendRegionOpen(plan.getDestination(), region, favoredNodes);
@@ -1847,7 +1857,7 @@ public class AssignmentManager {
return; // Region is not in the expected state any more
}
List<ServerName> favoredNodes = ServerName.EMPTY_SERVER_LIST;
- if (shouldAssignRegionsWithFavoredNodes) {
+ if (shouldAssignFavoredNodes(hri)) {
favoredNodes =
((MasterServices)server).getFavoredNodesManager().getFavoredNodes(hri);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/680289d6/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 7307372..e615246 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -1801,8 +1801,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
regionServer.service.submit(new OpenMetaHandler(
regionServer, regionServer, region, htd, masterSystemTime));
} else {
- regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(),
- regionOpenInfo.getFavoredNodesList());
+ if (regionOpenInfo.getFavoredNodesCount() > 0) {
+ regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(),
+ regionOpenInfo.getFavoredNodesList());
+ }
if (htd.getPriority() >= HConstants.ADMIN_QOS || region.getTable().isSystemTable()) {
regionServer.service.submit(new OpenPriorityRegionHandler(
regionServer, regionServer, region, htd, masterSystemTime));
@@ -2100,8 +2102,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
UpdateFavoredNodesResponse.Builder respBuilder = UpdateFavoredNodesResponse.newBuilder();
for (UpdateFavoredNodesRequest.RegionUpdateInfo regionUpdateInfo : openInfoList) {
HRegionInfo hri = HRegionInfo.convert(regionUpdateInfo.getRegion());
- regionServer.updateRegionFavoredNodesMapping(hri.getEncodedName(),
- regionUpdateInfo.getFavoredNodesList());
+ if (regionUpdateInfo.getFavoredNodesCount() > 0) {
+ regionServer.updateRegionFavoredNodesMapping(hri.getEncodedName(),
+ regionUpdateInfo.getFavoredNodesList());
+ }
}
respBuilder.setResponse(openInfoList.size());
return respBuilder.build();
http://git-wip-us.apache.org/repos/asf/hbase/blob/680289d6/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableFavoredNodes.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableFavoredNodes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableFavoredNodes.java
index 957e04a..0cdcbb9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableFavoredNodes.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableFavoredNodes.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.favored.FavoredNodeAssignmentHelper;
import org.apache.hadoop.hbase.favored.FavoredNodeLoadBalancer;
import org.apache.hadoop.hbase.favored.FavoredNodesManager;
@@ -325,6 +326,30 @@ public class TestTableFavoredNodes {
}
}
+ /*
+ * Check favored nodes for system tables
+ */
+ @Test
+ public void testSystemTables() throws Exception {
+
+ TableName tableName = TableName.valueOf("createTable");
+ TEST_UTIL.createTable(tableName, Bytes.toBytes("f"), splitKeys);
+ TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
+
+ // All regions should have favored nodes
+ checkIfFavoredNodeInformationIsCorrect(tableName);
+
+ for (TableName sysTable :
+ admin.listTableNamesByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) {
+ List<HRegionInfo> regions = admin.getTableRegions(sysTable);
+ for (HRegionInfo region : regions) {
+ assertNull("FN should be null for sys region", fnm.getFavoredNodes(region));
+ }
+ }
+
+ TEST_UTIL.deleteTable(tableName);
+ }
+
private void checkIfDaughterInherits2FN(List<ServerName> parentFN, List<ServerName> daughterFN) {
assertNotNull(parentFN);