hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tof...@apache.org
Subject hbase git commit: HBASE-17198 Remove redundant FN updates to merged region
Date Tue, 31 Jan 2017 19:18:14 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 680289d67 -> bd7c9581f


HBASE-17198 Remove redundant FN updates to merged region

Signed-off-by: Francis Liu <toffer@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd7c9581
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd7c9581
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd7c9581

Branch: refs/heads/master
Commit: bd7c9581f20b864db41dfdf83b6240c8a5dcca9d
Parents: 680289d
Author: Thiruvel Thirumoolan <thiruvel@gmail.com>
Authored: Thu Dec 8 19:21:58 2016 -0800
Committer: Francis Liu <toffer@apache.org>
Committed: Tue Jan 31 11:17:58 2017 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/master/AssignmentManager.java       | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bd7c9581/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 61eeb7e..6fdba7b 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
@@ -2684,20 +2684,7 @@ public class AssignmentManager {
     regionOnline(hri, serverName, 1);
 
     try {
-      if (this.shouldAssignRegionsWithFavoredNodes) {
-        processFavoredNodesForMerge(hri, a, b);
-        /*
-         * This can be removed once HBASE-16119 (Procedure v2 Merge) is implemented and AM
force
-         * assigns the merged region on the same region server. FavoredNodes for the region
would
-         * be passed along with OpenRegionRequest and hence the following would become redundant.
-         */
-        List<ServerName> favoredNodes = server.getFavoredNodesManager().getFavoredNodes(hri);
-        if (favoredNodes != null) {
-          Map<HRegionInfo, List<ServerName>> regionFNMap = new HashMap<>(1);
-          regionFNMap.put(hri, favoredNodes);
-          server.getServerManager().sendFavoredNodes(serverName, regionFNMap);
-        }
-      }
+      processFavoredNodesForMerge(hri, a, b);
     } catch (IOException e) {
       LOG.error("Error while processing favored nodes after merge.", e);
       return StringUtils.stringifyException(e);


Mime
View raw message