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:03:45 UTC
[hbase] branch branch-2 updated (558913ea1ad -> 2eee1cc7e4d)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 558913ea1ad HBASE-27823 NPE in ClaimReplicationQueuesProcedure when running TestAssignmentManager.testAssignSocketTimeout (#5216)
new 1df5e40f738 HBASE-27823 Addendum fix compile error
new 2eee1cc7e4d HBASE-27824 NPE in MetricsMasterWrapperImpl.isRunning (#5218)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 6 +-----
.../apache/hadoop/hbase/master/assignment/MockMasterServices.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
[hbase] 01/02: HBASE-27823 Addendum fix compile error
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 1df5e40f738d47df322ead6132fdc17b55d4500c
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu May 4 23:03:06 2023 +0800
HBASE-27823 Addendum fix compile error
---
.../org/apache/hadoop/hbase/master/assignment/MockMasterServices.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 91fc75510e9..538476be306 100644
--- 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
@@ -151,7 +151,7 @@ public class MockMasterServices extends MockNoopMasterServices {
// ClusterConnection return the HRI. Have the HRI return a few mocked up responses
// to make our test work.
this.connection = HConnectionTestingUtility.getMockedConnectionAndDecorate(getConfiguration(),
- Mockito.mock(AdminProtos.AdminService.BlockingInterface.class), ri, MOCK_MASTER_SERVERNAME,
+ mock(AdminProtos.AdminService.BlockingInterface.class), ri, MOCK_MASTER_SERVERNAME,
RegionInfoBuilder.FIRST_META_REGIONINFO);
// Set hbase.rootdir into test dir.
Path rootdir = CommonFSUtils.getRootDir(getConfiguration());
[hbase] 02/02: HBASE-27824 NPE in MetricsMasterWrapperImpl.isRunning (#5218)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 2eee1cc7e4db65e6b7ff1a1846d7d900316ebbae
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 +-----
1 file changed, 1 insertion(+), 5 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 7d9f0cf4707..062e40aeeab 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