HBASE-28158 check style and unit test fix

Author: ukumawat

hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java

@@ -2061,7 +2061,7 @@ public Pair<Integer, Integer> getReopenStatus(TableName tableName) {
   // This comparator sorts the RegionStates by time stamp then Region name.
   // Comparing by timestamp alone can lead us to discard different RegionStates that happen
   // to share a timestamp.
-  private static class RegionStateStampComparator implements Comparator<RegionState> {
+  private final static class RegionStateStampComparator implements Comparator<RegionState> {
     @Override
     public int compare(final RegionState l, final RegionState r) {
       int stampCmp = Long.compare(l.getStamp(), r.getStamp());
@@ -2320,8 +2320,9 @@ public void markRegionsAsCrashed(List<RegionInfo> regionsOnCrashedServer,
     ServerName crashedServerName) {
     for (RegionInfo regionInfo : regionsOnCrashedServer) {
       RegionStateNode node = regionStates.getOrCreateRegionStateNode(regionInfo);
-      if (node.getRegionLocation() == crashedServerName)
+      if (node.getRegionLocation() == crashedServerName) {
         regionInTransitionTracker.regionCrashed(node);
+      }
     }
   }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionInTransitionTracker.java

@@ -51,6 +51,10 @@ public boolean isRegionInTransition(final RegionInfo regionInfo) {
   }
 
   public void regionCrashed(RegionStateNode regionStateNode) {
+    if (regionStateNode.getRegionInfo().getReplicaId() != RegionInfo.DEFAULT_REPLICA_ID) {
+      return;
+    }
+
     if (addRegionInTransition(regionStateNode)) {
       LOG.debug("{} added to RIT list because hosting region server is crashed ",
         regionStateNode.getRegionInfo().getEncodedName());

hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java

@@ -3468,9 +3468,13 @@ public String explainFailure() throws IOException {
       @Override
       public boolean evaluate() throws IOException {
         HMaster master = getMiniHBaseCluster().getMaster();
-        if (master == null) return false;
+        if (master == null) {
+          return false;
+        }
         AssignmentManager am = master.getAssignmentManager();
-        if (am == null) return false;
+        if (am == null) {
+          return false;
+        }
         return am.getRegionTransitScheduledCount() == 0;
       }
     };

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java

@@ -132,7 +132,7 @@ public void testCreateTableWithSingleReplica() throws Exception {
           .setColumnFamily(ColumnFamilyDescriptorBuilder.of("family")).build();
       ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions);
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
 
       validateNumberOfRowsInMeta(tableName, numRegions, ADMIN.getConnection());
       List<RegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName);
@@ -154,7 +154,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
           .setColumnFamily(ColumnFamilyDescriptorBuilder.of("family")).build();
       ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions);
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       validateNumberOfRowsInMeta(tableName, numRegions, ADMIN.getConnection());
 
       List<RegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName);
@@ -187,7 +187,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
       TEST_UTIL.getHBaseClusterInterface().startMaster(master.getHostname(), master.getPort());
       TEST_UTIL.getHBaseClusterInterface().waitForActiveAndReadyMaster();
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       assertRegionStateNotNull(hris, numRegions, numReplica);
       validateFromSnapshotFromMeta(TEST_UTIL, tableName, numRegions, numReplica,
         ADMIN.getConnection());
@@ -207,7 +207,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
         StartTestingClusterOption.builder().numRegionServers(numSlaves).rsPorts(rsports).build();
       TEST_UTIL.startMiniHBaseCluster(option);
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       resetConnections();
       validateFromSnapshotFromMeta(TEST_UTIL, tableName, numRegions, numReplica,
         ADMIN.getConnection());
@@ -217,7 +217,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
       TEST_UTIL.shutdownMiniHBaseCluster();
       TEST_UTIL.startMiniHBaseCluster();
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       resetConnections();
       validateSingleRegionServerAssignment(ADMIN.getConnection(), numRegions, numReplica);
       for (int i = 1; i < numSlaves; i++) { // restore the cluster
@@ -234,7 +234,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
       LOG.info(ADMIN.getDescriptor(tableName).toString());
       assertTrue(ADMIN.isTableEnabled(tableName));
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       List<RegionInfo> regions = TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager()
         .getRegionStates().getRegionsOfTable(tableName);
       assertTrue("regions.size=" + regions.size() + ", numRegions=" + numRegions + ", numReplica="
@@ -247,7 +247,7 @@ public void testCreateTableWithMultipleReplicas() throws Exception {
       ADMIN.enableTable(tableName);
       assertTrue(ADMIN.isTableEnabled(tableName));
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       regions = TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager().getRegionStates()
         .getRegionsOfTable(tableName);
       assertEquals(numRegions * numReplica, regions.size());
@@ -298,7 +298,7 @@ public void testIncompleteMetaTableReplicaInformation() throws Exception {
           .setColumnFamily(ColumnFamilyDescriptorBuilder.of("family")).build();
       ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions);
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       Set<byte[]> tableRows = new HashSet<>();
       List<RegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName);
       for (RegionInfo hri : hris) {
@@ -324,7 +324,7 @@ public void testIncompleteMetaTableReplicaInformation() throws Exception {
       ADMIN.enableTable(tableName);
       assertTrue(ADMIN.isTableEnabled(tableName));
       TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
-      TEST_UTIL.waitUntilNoRegionTransitScheduled();
+      TEST_UTIL.waitUntilNoRegionsInTransition();
       List<RegionInfo> regions = TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager()
         .getRegionStates().getRegionsOfTable(tableName);
       assertEquals(numRegions * numReplica, regions.size());