fix UT

apache · May 16, 2021 · 1da9d68 · 1da9d68
1 parent 43d461a
commit 1da9d68
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
@@ -76,7 +76,7 @@ public class RSGroupBasedLoadBalancer implements LoadBalancer {
   private MasterServices masterServices;
   private FavoredNodesManager favoredNodesManager;
   private volatile RSGroupInfoManager rsGroupInfoManager;
-  private LoadBalancer internalBalancer;
+  private volatile LoadBalancer internalBalancer;
 
   /**
    * Set this key to {@code true} to allow region fallback.
@@ -87,7 +87,7 @@ public class RSGroupBasedLoadBalancer implements LoadBalancer {
    */
   public static final String FALLBACK_GROUP_ENABLE_KEY = "hbase.rsgroup.fallback.enable";
 
-  private boolean fallbackEnabled = false;
+  private volatile boolean fallbackEnabled = false;
 
   /**
    * Used by reflection in {@link org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory}.

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java
@@ -175,7 +175,8 @@ public void restartRegionServer(ServerName serverName) throws IOException {
       return;
     }
     ServerName sn = ServerName.valueOf(serverName.getAddress().toString(), startCode);
-    serverManager.regionServerReport(sn, ServerMetricsBuilder.of(sn));
+    serverManager.regionServerReport(sn, ServerMetricsBuilder.newBuilder(sn)
+      .setLastReportTimestamp(System.currentTimeMillis()).build());
   }
 
   @Override

diff --git a/...er/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManagerBase.java b/...er/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManagerBase.java
@@ -309,7 +309,8 @@ protected void doCrash(final ServerName serverName) {
     ServerName newSn = ServerName.valueOf("localhost", 10000 + newRsAdded, 1);
     newRsAdded++;
     try {
-      this.master.getServerManager().regionServerReport(newSn, ServerMetricsBuilder.of(newSn));
+      this.master.getServerManager().regionServerReport(newSn, ServerMetricsBuilder
+        .newBuilder(newSn).setLastReportTimestamp(System.currentTimeMillis()).build());
     } catch (YouAreDeadException e) {
       // should not happen
       throw new UncheckedIOException(e);