Repository: hbase Updated Branches: refs/heads/master 4ad3fe1f2 -> cc873713c
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/cc873713 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cc873713 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cc873713 Branch: refs/heads/master Commit: cc873713c17738cecc2264c236586af3a7b91c1f Parents: 4ad3fe1 Author: Jimmy Xiang <[email protected]> Authored: Mon Sep 15 11:38:30 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Tue Sep 16 09:19:27 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/cc873713/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 ab764a3..c312de8 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 @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.protobuf; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.classification.InterfaceAudience; @@ -704,18 +703,22 @@ 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<Pair<HRegionInfo, + buildOpenRegionRequest(ServerName server, final List<Pair<HRegionInfo, List<ServerName>>> regionOpenInfos, Boolean openForReplay) { OpenRegionRequest.Builder builder = OpenRegionRequest.newBuilder(); for (Pair<HRegionInfo, List<ServerName>> regionOpenInfo: regionOpenInfos) { builder.addOpenInfo(buildRegionOpenInfo(regionOpenInfo.getFirst(), regionOpenInfo.getSecond(), openForReplay)); } + if (server != null) { + builder.setServerStartCode(server.getStartcode()); + } return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/cc873713/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 60fb2bb..2449164 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 @@ -756,7 +756,7 @@ public class ServerManager { " failed because no RPC connection found to this server"); } - 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);
