You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2023/05/04 15:15:05 UTC
[hbase] branch branch-2.4 updated: HBASE-27824 NPE in MetricsMasterWrapperImpl.isRunning (#5218)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 458d74671a2 HBASE-27824 NPE in MetricsMasterWrapperImpl.isRunning (#5218)
458d74671a2 is described below
commit 458d74671a2b61544a319e67638c228efed9ea94
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu May 4 20:59:40 2023 +0800
HBASE-27824 NPE in MetricsMasterWrapperImpl.isRunning (#5218)
Signed-off-by: Liangjun He <he...@apache.org>
(cherry picked from commit 78610decaa5b6b5eca8c770e0eb33f73f27b83a9)
---
.../java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 6 +-----
.../hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java | 2 --
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
index 24bbc04dcf2..c1b8d2df7bb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
@@ -64,13 +64,9 @@ public class MockNoopMasterServices implements MasterServices {
private final Configuration conf;
private final MetricsMaster metricsMaster;
- public MockNoopMasterServices() {
- this(null);
- }
-
public MockNoopMasterServices(final Configuration conf) {
this.conf = conf;
- this.metricsMaster = new MetricsMaster(new MetricsMasterWrapperImpl(null));
+ this.metricsMaster = new MetricsMaster(new MetricsMasterWrapperImpl(mock(HMaster.class)));
}
@Override
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
index d3f87dcb6b5..bc8f08194f8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
@@ -42,7 +42,6 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.Size;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.master.MockNoopMasterServices;
import org.apache.hadoop.hbase.master.RegionPlan;
import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster;
import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer.ServerLocalityCostFunction;
@@ -188,7 +187,6 @@ public class TestStochasticLoadBalancer extends BalancerTestBase {
@Test
public void testLocalityCost() throws Exception {
Configuration conf = HBaseConfiguration.create();
- MockNoopMasterServices master = new MockNoopMasterServices();
StochasticLoadBalancer.CostFunction costFunction = new ServerLocalityCostFunction(conf);
for (int test = 0; test < clusterRegionLocationMocks.length; test++) {