Repository: hbase Updated Branches: refs/heads/HBASE-14070.HLC 58a51bcb7 -> 035dd8b53
HBASE-18539 Deprecated master_system_time field in Admin.proto in favor of NodeTime which contains system clock and hlc times. Change-Id: I9830052f5e8bfbc6d1882d01a2cb79d53c78014f Signed-off-by: Apekshit Sharma <a...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/035dd8b5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/035dd8b5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/035dd8b5 Branch: refs/heads/HBASE-14070.HLC Commit: 035dd8b5354da83f2f9762248cfbd7b01adf2f61 Parents: 58a51bc Author: Amit Patel <iamnota...@gmail.com> Authored: Tue Aug 15 16:15:39 2017 -0700 Committer: Apekshit Sharma <a...@apache.org> Committed: Tue Aug 15 16:18:38 2017 -0700 ---------------------------------------------------------------------- .../hbase/shaded/protobuf/ProtobufUtil.java | 2 -- .../hbase/shaded/protobuf/RequestConverter.java | 4 ---- .../src/main/protobuf/Admin.proto | 5 +++-- hbase-protocol/src/main/protobuf/Admin.proto | 8 ++++---- .../master/procedure/RSProcedureDispatcher.java | 1 - .../hadoop/hbase/regionserver/CompactSplit.java | 4 ++-- .../hbase/regionserver/HRegionServer.java | 7 +++---- .../hbase/regionserver/RSRpcServices.java | 11 ++++------- .../hbase/regionserver/RegionMergeRequest.java | 3 +-- .../regionserver/RegionServerServices.java | 15 +++------------ .../regionserver/handler/OpenMetaHandler.java | 4 ++-- .../handler/OpenPriorityRegionHandler.java | 4 ++-- .../regionserver/handler/OpenRegionHandler.java | 20 ++++++++------------ .../regionserver/TestRegionServerNoMaster.java | 2 +- 14 files changed, 33 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index 407d59f..3fad23e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -3468,8 +3468,6 @@ public final class ProtobufUtil { builder.setRegionA(regionASpecifier); builder.setRegionB(regionBSpecifier); builder.setForcible(forcible); - // send the master's wall clock time as well, so that the RS can refer to it - builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime()); return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java index 63ea962..d57ffb7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java @@ -903,9 +903,6 @@ public final class RequestConverter { .setTimestamp(nodeTime.getSecond()); } } - // TODO: remove uses of master system time - // send the master's wall clock time as well, so that the RS can refer to it - builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime()); return builder.build(); } @@ -928,7 +925,6 @@ public final class RequestConverter { if (server != null) { builder.setServerStartCode(server.getStartcode()); } - builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime()); if (nodeTimes != null) { for (Pair<ClockType, Long> nodeTime : nodeTimes) { builder.addNodeTimesBuilder() http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-protocol-shaded/src/main/protobuf/Admin.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto b/hbase-protocol-shaded/src/main/protobuf/Admin.proto index e1315e3..a8d103e 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto @@ -290,8 +290,9 @@ message MergeRegionsRequest { required RegionSpecifier region_a = 1; required RegionSpecifier region_b = 2; optional bool forcible = 3 [default = false]; - // wall clock time from master - optional uint64 master_system_time = 4; + // With amv2, master will issue assign/unassign requests as part of merge which will keep time + // updated between master and RS. + optional uint64 master_system_time = 4 [deprecated=true]; } message MergeRegionsResponse { http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-protocol/src/main/protobuf/Admin.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/protobuf/Admin.proto b/hbase-protocol/src/main/protobuf/Admin.proto index 6096966..b152c28 100644 --- a/hbase-protocol/src/main/protobuf/Admin.proto +++ b/hbase-protocol/src/main/protobuf/Admin.proto @@ -70,8 +70,8 @@ message OpenRegionRequest { repeated RegionOpenInfo open_info = 1; // the intended server for this RPC. optional uint64 serverStartCode = 2; - // wall clock time from master - optional uint64 master_system_time = 5; + // Deprecated when corresponding field in hbase-shaded-protocol was deprecated. + optional uint64 master_system_time = 5 [deprecated=true]; message RegionOpenInfo { required RegionInfo region = 1; @@ -185,8 +185,8 @@ message MergeRegionsRequest { required RegionSpecifier region_a = 1; required RegionSpecifier region_b = 2; optional bool forcible = 3 [default = false]; - // wall clock time from master - optional uint64 master_system_time = 4; + // Deprecated when corresponding field in hbase-shaded-protocol was deprecated. + optional uint64 master_system_time = 4 [deprecated=true]; } message MergeRegionsResponse { http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.java index d56f952..8d016b7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.java @@ -342,7 +342,6 @@ public class RSProcedureDispatcher final ServerName serverName, final List<RegionOpenOperation> operations) { final OpenRegionRequest.Builder builder = OpenRegionRequest.newBuilder(); builder.setServerStartCode(serverName.getStartcode()); - builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime()); // Set master clock time for send event builder.addNodeTimesBuilder() http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java index 5d3b50b..a2dea5c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java @@ -209,9 +209,9 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati } public synchronized void requestRegionsMerge(final Region a, - final Region b, final boolean forcible, long masterSystemTime, User user) { + final Region b, final boolean forcible, User user) { try { - mergePool.execute(new RegionMergeRequest(a, b, this.server, forcible, masterSystemTime,user)); + mergePool.execute(new RegionMergeRequest(a, b, this.server, forcible, user)); if (LOG.isDebugEnabled()) { LOG.debug("Region merge requested for " + a + "," + b + ", forcible=" + forcible + ". " + this); http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index db13b19..c46c634 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -2187,14 +2187,13 @@ public class HRegionServer extends HasThread implements @Override public void postOpenDeployTasks(final Region r) throws KeeperException, IOException { - postOpenDeployTasks(new PostOpenDeployContext(r, -1)); + postOpenDeployTasks(new PostOpenDeployContext(r)); } @Override public void postOpenDeployTasks(final PostOpenDeployContext context) throws KeeperException, IOException { Region r = context.getRegion(); - long masterSystemTime = context.getMasterSystemTime(); Preconditions.checkArgument(r instanceof HRegion, "r must be an HRegion"); rpcServices.checkOpen(); LOG.info("Post open deploy tasks for " + r.getRegionInfo().getRegionNameAsString()); @@ -2217,7 +2216,7 @@ public class HRegionServer extends HasThread implements // Notify master if (!reportRegionStateTransition(new RegionStateTransitionContext( - TransitionCode.OPENED, openSeqNum, masterSystemTime, r.getRegionInfo()))) { + TransitionCode.OPENED, openSeqNum, r.getRegionInfo()))) { throw new IOException("Failed to report opened region to master: " + r.getRegionInfo().getRegionNameAsString()); } @@ -2236,7 +2235,7 @@ public class HRegionServer extends HasThread implements public boolean reportRegionStateTransition( TransitionCode code, long openSeqNum, HRegionInfo... hris) { return reportRegionStateTransition( - new RegionStateTransitionContext(code, HConstants.NO_SEQNUM, -1, hris)); + new RegionStateTransitionContext(code, HConstants.NO_SEQNUM, hris)); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/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 8493183..ab50ad3 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 @@ -1910,8 +1910,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } } - long masterSystemTime = request.hasMasterSystemTime() ? request.getMasterSystemTime() : -1; - for (NodeTime nodeTime : request.getNodeTimesList()) { // Update region server clock on receive event regionServer.getClock(ProtobufUtil.toClockType(nodeTime.getClockType())) @@ -1992,7 +1990,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, // Need to pass the expected version in the constructor. if (region.isMetaRegion()) { regionServer.service.submit(new OpenMetaHandler( - regionServer, regionServer, region, htd, masterSystemTime)); + regionServer, regionServer, region, htd)); } else { if (regionOpenInfo.getFavoredNodesCount() > 0) { regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(), @@ -2000,10 +1998,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } if (htd.getPriority() >= HConstants.ADMIN_QOS || region.getTable().isSystemTable()) { regionServer.service.submit(new OpenPriorityRegionHandler( - regionServer, regionServer, region, htd, masterSystemTime)); + regionServer, regionServer, region, htd)); } else { regionServer.service.submit(new OpenRegionHandler( - regionServer, regionServer, region, htd, masterSystemTime)); + regionServer, regionServer, region, htd)); } } } @@ -3540,7 +3538,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler, Region regionA = getRegion(request.getRegionA()); Region regionB = getRegion(request.getRegionB()); boolean forcible = request.getForcible(); - long masterSystemTime = request.hasMasterSystemTime() ? request.getMasterSystemTime() : -1; regionA.startRegionOperation(Operation.MERGE_REGION); regionB.startRegionOperation(Operation.MERGE_REGION); if (regionA.getRegionInfo().getReplicaId() != HRegionInfo.DEFAULT_REPLICA_ID || @@ -3552,7 +3549,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, regionA.flush(true); regionB.flush(true); regionServer.compactSplitThread.requestRegionsMerge(regionA, regionB, forcible, - masterSystemTime, RpcServer.getRequestUser()); + RpcServer.getRequestUser()); return MergeRegionsResponse.newBuilder().build(); } catch (DroppedSnapshotException ex) { regionServer.abort("Replay of WAL required. Forcing server shutdown", ex); http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java index e95932b..eaa0e02 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java @@ -43,8 +43,7 @@ class RegionMergeRequest implements Runnable { private final boolean forcible; private final User user; - RegionMergeRequest(Region a, Region b, HRegionServer hrs, boolean forcible, - long masterSystemTime, User user) { + RegionMergeRequest(Region a, Region b, HRegionServer hrs, boolean forcible, User user) { Preconditions.checkNotNull(hrs); this.region_a = a.getRegionInfo(); this.region_b = b.getRegionInfo(); http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java index 251ff32..8e9c742 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java @@ -106,19 +106,14 @@ public interface RegionServerServices extends OnlineRegions, FavoredNodesForRegi */ class PostOpenDeployContext { private final Region region; - private final long masterSystemTime; @InterfaceAudience.Private - public PostOpenDeployContext(Region region, long masterSystemTime) { + public PostOpenDeployContext(Region region) { this.region = region; - this.masterSystemTime = masterSystemTime; } public Region getRegion() { return region; } - public long getMasterSystemTime() { - return masterSystemTime; - } } /** @@ -146,15 +141,13 @@ public interface RegionServerServices extends OnlineRegions, FavoredNodesForRegi class RegionStateTransitionContext { private final TransitionCode code; private final long openSeqNum; - private final long masterSystemTime; private final HRegionInfo[] hris; @InterfaceAudience.Private - public RegionStateTransitionContext(TransitionCode code, long openSeqNum, long masterSystemTime, + public RegionStateTransitionContext(TransitionCode code, long openSeqNum, HRegionInfo... hris) { this.code = code; this.openSeqNum = openSeqNum; - this.masterSystemTime = masterSystemTime; this.hris = hris; } public TransitionCode getCode() { @@ -163,9 +156,7 @@ public interface RegionServerServices extends OnlineRegions, FavoredNodesForRegi public long getOpenSeqNum() { return openSeqNum; } - public long getMasterSystemTime() { - return masterSystemTime; - } + public HRegionInfo[] getHris() { return hris; } http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java index e49b164..3b96a9e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.regionserver.RegionServerServices; public class OpenMetaHandler extends OpenRegionHandler { public OpenMetaHandler(final Server server, final RegionServerServices rsServices, HRegionInfo regionInfo, - final HTableDescriptor htd, long masterSystemTime) { - super(server, rsServices, regionInfo, htd, masterSystemTime, EventType.M_RS_OPEN_META); + final HTableDescriptor htd) { + super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_META); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenPriorityRegionHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenPriorityRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenPriorityRegionHandler.java index 83d4d3f..e25510e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenPriorityRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenPriorityRegionHandler.java @@ -34,8 +34,8 @@ import org.apache.hadoop.hbase.regionserver.RegionServerServices; @InterfaceAudience.Private public class OpenPriorityRegionHandler extends OpenRegionHandler { public OpenPriorityRegionHandler(Server server, RegionServerServices rsServices, - HRegionInfo regionInfo, HTableDescriptor htd, long masterSystemTime) { - super(server, rsServices, regionInfo, htd, masterSystemTime, + HRegionInfo regionInfo, HTableDescriptor htd) { + super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_PRIORITY_REGION); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java index 8369100..2da0e23 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java @@ -49,22 +49,20 @@ public class OpenRegionHandler extends EventHandler { private final HRegionInfo regionInfo; private final HTableDescriptor htd; - private final long masterSystemTime; public OpenRegionHandler(final Server server, final RegionServerServices rsServices, HRegionInfo regionInfo, - HTableDescriptor htd, long masterSystemTime) { - this(server, rsServices, regionInfo, htd, masterSystemTime, EventType.M_RS_OPEN_REGION); + HTableDescriptor htd) { + this(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_REGION); } protected OpenRegionHandler(final Server server, final RegionServerServices rsServices, final HRegionInfo regionInfo, - final HTableDescriptor htd, long masterSystemTime, EventType eventType) { + final HTableDescriptor htd, EventType eventType) { super(server, eventType); this.rsServices = rsServices; this.regionInfo = regionInfo; this.htd = htd; - this.masterSystemTime = masterSystemTime; } public HRegionInfo getRegionInfo() { @@ -109,7 +107,7 @@ public class OpenRegionHandler extends EventHandler { return; } - if (!updateMeta(region, masterSystemTime) || this.server.isStopped() || + if (!updateMeta(region) || this.server.isStopped() || this.rsServices.isStopping()) { return; } @@ -170,7 +168,7 @@ public class OpenRegionHandler extends EventHandler { * state meantime so master doesn't timeout our region-in-transition. * Caller must cleanup region if this fails. */ - boolean updateMeta(final HRegion r, long masterSystemTime) { + boolean updateMeta(final HRegion r) { if (this.server.isStopped() || this.rsServices.isStopping()) { return false; } @@ -178,7 +176,7 @@ public class OpenRegionHandler extends EventHandler { // Else, wait. final AtomicBoolean signaller = new AtomicBoolean(false); PostOpenDeployTasksThread t = new PostOpenDeployTasksThread(r, - this.server, this.rsServices, signaller, masterSystemTime); + this.server, this.rsServices, signaller); t.start(); // Post open deploy task: // meta => update meta location in ZK @@ -227,23 +225,21 @@ public class OpenRegionHandler extends EventHandler { private final RegionServerServices services; private final HRegion region; private final AtomicBoolean signaller; - private final long masterSystemTime; PostOpenDeployTasksThread(final HRegion region, final Server server, - final RegionServerServices services, final AtomicBoolean signaller, long masterSystemTime) { + final RegionServerServices services, final AtomicBoolean signaller) { super("PostOpenDeployTasks:" + region.getRegionInfo().getEncodedName()); this.setDaemon(true); this.server = server; this.services = services; this.region = region; this.signaller = signaller; - this.masterSystemTime = masterSystemTime; } @Override public void run() { try { - this.services.postOpenDeployTasks(new PostOpenDeployContext(region, masterSystemTime)); + this.services.postOpenDeployTasks(new PostOpenDeployContext(region)); } catch (Throwable e) { String msg = "Exception running postOpenDeployTasks; region=" + this.region.getRegionInfo().getEncodedName(); http://git-wip-us.apache.org/repos/asf/hbase/blob/035dd8b5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java index e2ec7ea..f048d22 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java @@ -263,7 +263,7 @@ public class TestRegionServerNoMaster { // Let's start the open handler HTableDescriptor htd = getRS().tableDescriptors.get(hri.getTable()); - getRS().service.submit(new OpenRegionHandler(getRS(), getRS(), hri, htd, -1)); + getRS().service.submit(new OpenRegionHandler(getRS(), getRS(), hri, htd)); // The open handler should have removed the region from RIT but kept the region closed checkRegionIsClosed(HTU, getRS(), hri);
