Repository: hbase Updated Branches: refs/heads/0.98 884b049ce -> f5f81cc79
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-protocol/src/main/protobuf/RegionServerStatus.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/protobuf/RegionServerStatus.proto b/hbase-protocol/src/main/protobuf/RegionServerStatus.proto index fbd6e05..df9a521 100644 --- a/hbase-protocol/src/main/protobuf/RegionServerStatus.proto +++ b/hbase-protocol/src/main/protobuf/RegionServerStatus.proto @@ -78,7 +78,7 @@ message GetLastFlushedSequenceIdResponse { required uint64 last_flushed_sequence_id = 1; } -message RegionTransition { +message RegionStateTransition { required TransitionCode transition_code = 1; /** Mutliple regions are involved during merging/splitting */ @@ -107,14 +107,14 @@ message RegionTransition { } } -message ReportRegionTransitionRequest { +message ReportRegionStateTransitionRequest { /** This region server's server name */ required ServerName server = 1; - repeated RegionTransition transition = 2; + repeated RegionStateTransition transition = 2; } -message ReportRegionTransitionResponse { +message ReportRegionStateTransitionResponse { /** Error message if failed to update the region state */ optional string error_message = 1; } @@ -146,6 +146,6 @@ service RegionServerStatusService { * transition. If the request fails, the transition should * be aborted. */ - rpc ReportRegionTransition(ReportRegionTransitionRequest) - returns(ReportRegionTransitionResponse); + rpc ReportRegionStateTransition(ReportRegionStateTransitionRequest) + returns(ReportRegionStateTransitionResponse); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/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 0f28f7d..4dff74e 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 @@ -66,7 +66,6 @@ import org.apache.hadoop.hbase.executor.EventType; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcClient.FailedServerException; -import org.apache.hadoop.hbase.ipc.RpcClient.FailedServerException; import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.balancer.FavoredNodeAssignmentHelper; @@ -75,9 +74,8 @@ import org.apache.hadoop.hbase.master.handler.ClosedRegionHandler; import org.apache.hadoop.hbase.master.handler.DisableTableHandler; import org.apache.hadoop.hbase.master.handler.EnableTableHandler; import org.apache.hadoop.hbase.master.handler.OpenedRegionHandler; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; -import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.RegionAlreadyInTransitionException; import org.apache.hadoop.hbase.regionserver.RegionMergeTransaction; import org.apache.hadoop.hbase.regionserver.RegionOpeningState; @@ -4063,7 +4061,7 @@ public class AssignmentManager extends ZooKeeperListener { * region open/close */ protected String onRegionTransition(final ServerName serverName, - final RegionServerStatusProtos.RegionTransition transition) { + final RegionStateTransition transition) { TransitionCode code = transition.getTransitionCode(); HRegionInfo hri = HRegionInfo.convert(transition.getRegionInfo(0)); RegionState current = regionStates.getRegionState(hri); http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 4e3eee1..af5e297 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -203,11 +203,11 @@ import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.Regio import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionTransitionRequest; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionTransitionResponse; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode; import org.apache.hadoop.hbase.replication.regionserver.Replication; import org.apache.hadoop.hbase.security.UserProvider; @@ -3200,10 +3200,10 @@ MasterServices, Server { } @Override - public ReportRegionTransitionResponse reportRegionTransition(RpcController controller, - ReportRegionTransitionRequest req) throws ServiceException { + public ReportRegionStateTransitionResponse reportRegionStateTransition(RpcController controller, + ReportRegionStateTransitionRequest req) throws ServiceException { try { - RegionTransition rt = req.getTransition(0); + RegionStateTransition rt = req.getTransition(0); TableName tableName = ProtobufUtil.toTableName( rt.getRegionInfo(0).getTableName()); if (!TableName.META_TABLE_NAME.equals(tableName) @@ -3214,8 +3214,8 @@ MasterServices, Server { } ServerName sn = ProtobufUtil.toServerName(req.getServer()); String error = assignmentManager.onRegionTransition(sn, rt); - ReportRegionTransitionResponse.Builder rrtr = - ReportRegionTransitionResponse.newBuilder(); + ReportRegionStateTransitionResponse.Builder rrtr = + ReportRegionStateTransitionResponse.newBuilder(); if (error != null) { rrtr.setErrorMessage(error); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/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 3a003da..ff86b00 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 @@ -196,11 +196,11 @@ import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.Regio import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStatusService; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionTransitionRequest; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionTransitionResponse; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse; import org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor; import org.apache.hadoop.hbase.regionserver.HRegion.Operation; import org.apache.hadoop.hbase.regionserver.Leases.LeaseStillHeldException; @@ -1848,7 +1848,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa this.serverNameFromMasterPOV, openSeqNum); } if (!useZKForAssignment - && !reportRegionTransition(TransitionCode.OPENED, openSeqNum, r.getRegionInfo())) { + && !reportRegionStateTransition(TransitionCode.OPENED, openSeqNum, r.getRegionInfo())) { throw new IOException("Failed to report opened region to master: " + r.getRegionNameAsString()); } @@ -1976,15 +1976,15 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa } @Override - public boolean reportRegionTransition(TransitionCode code, HRegionInfo... hris) { - return reportRegionTransition(code, HConstants.NO_SEQNUM, hris); + public boolean reportRegionStateTransition(TransitionCode code, HRegionInfo... hris) { + return reportRegionStateTransition(code, HConstants.NO_SEQNUM, hris); } @Override - public boolean reportRegionTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { - ReportRegionTransitionRequest.Builder builder = ReportRegionTransitionRequest.newBuilder(); + public boolean reportRegionStateTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { + ReportRegionStateTransitionRequest.Builder builder = ReportRegionStateTransitionRequest.newBuilder(); builder.setServer(ProtobufUtil.toServerName(serverName)); - RegionTransition.Builder transition = builder.addTransitionBuilder(); + RegionStateTransition.Builder transition = builder.addTransitionBuilder(); transition.setTransitionCode(code); if (code == TransitionCode.OPENED && openSeqNum >= 0) { transition.setOpenSeqNum(openSeqNum); @@ -1992,7 +1992,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa for (HRegionInfo hri : hris) { transition.addRegionInfo(HRegionInfo.convert(hri)); } - ReportRegionTransitionRequest request = builder.build(); + ReportRegionStateTransitionRequest request = builder.build(); while (keepLooping()) { RegionServerStatusService.BlockingInterface rss = rssStub; try { @@ -2000,7 +2000,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa createRegionServerStatusStub(); continue; } - ReportRegionTransitionResponse response = rss.reportRegionTransition(null, request); + ReportRegionStateTransitionResponse response = rss.reportRegionStateTransition(null, request); if (response.hasErrorMessage()) { LOG.info("Failed to transition " + hris[0] + " to " + code + ": " + response.getErrorMessage()); http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java index 095bf1d..054da41 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java @@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.executor.EventType; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.SplitTransaction.LoggingProgressable; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ConfigUtil; @@ -329,7 +329,7 @@ public class RegionMergeTransaction { region_a.getRegionInfo(), region_b.getRegionInfo(), server.getServerName(), metaEntries); } } else if (services != null && !useZKForAssignment) { - if (!services.reportRegionTransition(TransitionCode.MERGE_PONR, + if (!services.reportRegionStateTransition(TransitionCode.MERGE_PONR, mergedRegionInfo, region_a.getRegionInfo(), region_b.getRegionInfo())) { // Passed PONR, let SSH clean it up throw new IOException("Failed to notify master that merge passed PONR: " @@ -388,7 +388,7 @@ public class RegionMergeTransaction { + this.mergedRegionInfo.getRegionNameAsString(), e); } } else if (services != null && !useZKForAssignment) { - if (!services.reportRegionTransition(TransitionCode.READY_TO_MERGE, + if (!services.reportRegionStateTransition(TransitionCode.READY_TO_MERGE, mergedRegionInfo, region_a.getRegionInfo(), region_b.getRegionInfo())) { throw new IOException("Failed to get ok from master to merge " + region_a.getRegionInfo().getRegionNameAsString() + " and " @@ -571,7 +571,7 @@ public class RegionMergeTransaction { try { if (useZKForAssignment) { services.postOpenDeployTasks(merged, server.getCatalogTracker()); - } else if (!services.reportRegionTransition(TransitionCode.MERGED, + } else if (!services.reportRegionStateTransition(TransitionCode.MERGED, mergedRegionInfo, region_a.getRegionInfo(), region_b.getRegionInfo())) { throw new IOException("Failed to report merged region to master: " + mergedRegionInfo.getShortNameToLog()); @@ -773,7 +773,7 @@ public class RegionMergeTransaction { if (useZKAndZKIsSet(server)) { cleanZK(server, this.mergedRegionInfo); } else if (services != null && !useZKForAssignment - && !services.reportRegionTransition(TransitionCode.MERGE_REVERTED, + && !services.reportRegionStateTransition(TransitionCode.MERGE_REVERTED, mergedRegionInfo, region_a.getRegionInfo(), region_b.getRegionInfo())) { return false; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/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 7fbc5d4..e2ec169 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 @@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.ipc.PriorityFunction; import org.apache.hadoop.hbase.ipc.RpcServerInterface; import org.apache.hadoop.hbase.master.TableLockManager; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.zookeeper.KeeperException; @@ -86,12 +86,12 @@ public interface RegionServerServices /** * Notify master that a handler requests to change a region state */ - boolean reportRegionTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris); + boolean reportRegionStateTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris); /** * Notify master that a handler requests to change a region state */ - boolean reportRegionTransition(TransitionCode code, HRegionInfo... hris); + boolean reportRegionStateTransition(TransitionCode code, HRegionInfo... hris); /** * Returns a reference to the region server's RPC server http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java index 0a56f82..b651c48 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java @@ -49,7 +49,7 @@ import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.executor.EventType; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CancelableProgressable; import org.apache.hadoop.hbase.util.ConfigUtil; @@ -295,7 +295,7 @@ public class SplitTransaction { server.getServerName(), metaEntries); } } else if (services != null && !useZKForAssignment) { - if (!services.reportRegionTransition(TransitionCode.SPLIT_PONR, parent.getRegionInfo(), + if (!services.reportRegionStateTransition(TransitionCode.SPLIT_PONR, parent.getRegionInfo(), hri_a, hri_b)) { // Passed PONR, let SSH clean it up throw new IOException("Failed to notify master that split passed PONR: " @@ -318,7 +318,7 @@ public class SplitTransaction { this.parent.getRegionNameAsString(), e); } } else if (services != null && !useZKForAssignment) { - if (!services.reportRegionTransition(TransitionCode.READY_TO_SPLIT, + if (!services.reportRegionStateTransition(TransitionCode.READY_TO_SPLIT, parent.getRegionInfo(), hri_a, hri_b)) { throw new IOException("Failed to get ok from master to split " + parent.getRegionNameAsString()); @@ -430,7 +430,7 @@ public class SplitTransaction { if (useZKForAssignment) { // add 2nd daughter first (see HBASE-4335) services.postOpenDeployTasks(b, server.getCatalogTracker()); - } else if (!services.reportRegionTransition(TransitionCode.SPLIT, + } else if (!services.reportRegionStateTransition(TransitionCode.SPLIT, parent.getRegionInfo(), hri_a, hri_b)) { throw new IOException("Failed to report split region to master: " + parent.getRegionInfo().getShortNameToLog()); @@ -834,7 +834,7 @@ public class SplitTransaction { cleanZK(server, this.parent.getRegionInfo()); } else if (services != null && !useZKForAssignment - && !services.reportRegionTransition(TransitionCode.SPLIT_REVERTED, + && !services.reportRegionStateTransition(TransitionCode.SPLIT_REVERTED, parent.getRegionInfo(), hri_a, hri_b)) { return false; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java index 9e7ae24..3f79553 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.executor.EventHandler; import org.apache.hadoop.hbase.executor.EventType; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.util.ConfigUtil; @@ -167,7 +167,7 @@ public class CloseRegionHandler extends EventHandler { this.rsServices.removeFromOnlineRegions(region, destination); if (!useZKForAssignment) { - rsServices.reportRegionTransition(TransitionCode.CLOSED, regionInfo); + rsServices.reportRegionStateTransition(TransitionCode.CLOSED, regionInfo); } else { if (this.zk) { if (setClosedState(this.expectedVersion, region)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/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 f7c24ad..5a64731 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 @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.executor.EventHandler; import org.apache.hadoop.hbase.executor.EventType; import org.apache.hadoop.hbase.master.AssignmentManager; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerAccounting; import org.apache.hadoop.hbase.regionserver.RegionServerServices; @@ -225,7 +225,7 @@ public class OpenRegionHandler extends EventHandler { } } finally { if (!useZKForAssignment) { - rsServices.reportRegionTransition(TransitionCode.FAILED_OPEN, regionInfo); + rsServices.reportRegionStateTransition(TransitionCode.FAILED_OPEN, regionInfo); } else { // Even if cleanupFailed open fails we need to do this transition // See HBASE-7698 @@ -233,7 +233,7 @@ public class OpenRegionHandler extends EventHandler { } } } else if (!useZKForAssignment) { - rsServices.reportRegionTransition(TransitionCode.FAILED_OPEN, regionInfo); + rsServices.reportRegionStateTransition(TransitionCode.FAILED_OPEN, regionInfo); } else { // If still transition to OPENING is not done, we need to transition znode // to FAILED_OPEN http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java index 47ed875..1f87f35 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.ipc.RpcServerInterface; import org.apache.hadoop.hbase.master.TableLockManager; import org.apache.hadoop.hbase.master.TableLockManager.NullTableLockManager; import org.apache.hadoop.hbase.protobuf.generated.RPCProtos; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.CompactionRequestor; import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -232,13 +232,13 @@ class MockRegionServerServices implements RegionServerServices { } @Override - public boolean reportRegionTransition(TransitionCode code, long openSeqNum, + public boolean reportRegionStateTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { return false; } @Override - public boolean reportRegionTransition(TransitionCode code, + public boolean reportRegionStateTransition(TransitionCode code, HRegionInfo... hris) { return false; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java index 0fec42b..7a14a01 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java @@ -87,7 +87,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; import org.apache.hadoop.hbase.protobuf.generated.RPCProtos; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.CompactionRequestor; import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -566,12 +566,12 @@ ClientProtos.ClientService.BlockingInterface, RegionServerServices { } @Override - public boolean reportRegionTransition(TransitionCode code, HRegionInfo... hris) { + public boolean reportRegionStateTransition(TransitionCode code, HRegionInfo... hris) { return false; } @Override - public boolean reportRegionTransition(TransitionCode code, long openSeqNum, + public boolean reportRegionStateTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { return false; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java index c42128c..d83269d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java @@ -59,7 +59,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.executor.EventType; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer; -import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionTransition.TransitionCode; +import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ConfigUtil; @@ -978,13 +978,13 @@ public class TestAssignmentManagerOnCluster { @Override public boolean - reportRegionTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { + reportRegionStateTransition(TransitionCode code, long openSeqNum, HRegionInfo... hris) { if (simulateRetry == true) { // Simulate retry by calling the method twice - super.reportRegionTransition(code, openSeqNum, hris); - return super.reportRegionTransition(code, openSeqNum, hris); + super.reportRegionStateTransition(code, openSeqNum, hris); + return super.reportRegionStateTransition(code, openSeqNum, hris); } - return super.reportRegionTransition(code, openSeqNum, hris); + return super.reportRegionStateTransition(code, openSeqNum, hris); } @Override
