Repository: hbase Updated Branches: refs/heads/branch-1 8b4da86dc -> 95bc9a337
HBASE-11976 Server startcode is not checked for bulk region assignment Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/95bc9a33 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/95bc9a33 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/95bc9a33 Branch: refs/heads/branch-1 Commit: 95bc9a337e420f185ef088d00dfcf15846348094 Parents: 8b4da86 Author: Jimmy Xiang <[email protected]> Authored: Mon Sep 15 11:38:30 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Tue Sep 16 09:30:01 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/protobuf/RequestConverter.java | 7 +++++-- .../java/org/apache/hadoop/hbase/master/ServerManager.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/95bc9a33/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java index e7d0934..7ae4887 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.hadoop.hbase.util.ByteStringer; -import org.apache.commons.configuration.Configuration; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.DoNotRetryIOException; @@ -703,12 +702,13 @@ public final class RequestConverter { /** * Create a protocol buffer OpenRegionRequest to open a list of regions * + * @param server the serverName for the RPC * @param regionOpenInfos info of a list of regions to open * @param openForReplay * @return a protocol buffer OpenRegionRequest */ public static OpenRegionRequest - buildOpenRegionRequest(final List<Triple<HRegionInfo, Integer, + buildOpenRegionRequest(ServerName server, final List<Triple<HRegionInfo, Integer, List<ServerName>>> regionOpenInfos, Boolean openForReplay) { OpenRegionRequest.Builder builder = OpenRegionRequest.newBuilder(); for (Triple<HRegionInfo, Integer, List<ServerName>> regionOpenInfo: regionOpenInfos) { @@ -717,6 +717,9 @@ public final class RequestConverter { builder.addOpenInfo(buildRegionOpenInfo(regionOpenInfo.getFirst(), versionOfOfflineNode, regionOpenInfo.getThird(), openForReplay)); } + if (server != null) { + builder.setServerStartCode(server.getStartcode()); + } return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/95bc9a33/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index ca14571..a9304d6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -760,7 +760,7 @@ public class ServerManager { return null; } - OpenRegionRequest request = RequestConverter.buildOpenRegionRequest(regionOpenInfos, + OpenRegionRequest request = RequestConverter.buildOpenRegionRequest(server, regionOpenInfos, (RecoveryMode.LOG_REPLAY == this.services.getMasterFileSystem().getLogRecoveryMode())); try { OpenRegionResponse response = admin.openRegion(null, request);
