Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-26245 Addendum fix a naming issue

This commit is contained in:
Duo Zhang 2022-03-31 21:40:44 +08:00
parent bb1bbddf74
commit 27111421d9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/DummyRegionServerListStorage.java → hbase-server/src/test/java/org/apache/hadoop/hbase/master/DummyRegionServerList.java
View File

@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Set; import java.util.Set;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
public class DummyRegionServerListStorage implements RegionServerList { public class DummyRegionServerList implements RegionServerList {
@Override @Override
public void started(ServerName sn) { public void started(ServerName sn) {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
View File

@ -49,7 +49,7 @@ public class TestClockSkewDetection {
public void testClockSkewDetection() throws Exception { public void testClockSkewDetection() throws Exception {
final Configuration conf = HBaseConfiguration.create(); final Configuration conf = HBaseConfiguration.create();
ServerManager sm = ServerManager sm =
new ServerManager(new MockNoopMasterServices(conf), new DummyRegionServerListStorage()); new ServerManager(new MockNoopMasterServices(conf), new DummyRegionServerList());
LOG.debug("regionServerStartup 1"); LOG.debug("regionServerStartup 1");
InetAddress ia1 = InetAddress.getLocalHost(); InetAddress ia1 = InetAddress.getLocalHost();

4
hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java
View File

@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.client.HConnectionTestingUtility;
import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.client.TableState;
import org.apache.hadoop.hbase.master.DummyRegionServerListStorage; import org.apache.hadoop.hbase.master.DummyRegionServerList;
import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.LoadBalancer;
import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.MasterFileSystem;
import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.master.MasterServices;
@ -116,7 +116,7 @@ public class MockMasterServices extends MockNoopMasterServices {
this.assignmentManager = this.assignmentManager =
new AssignmentManager(this, masterRegion, new MockRegionStateStore(this, masterRegion)); new AssignmentManager(this, masterRegion, new MockRegionStateStore(this, masterRegion));
this.balancer = LoadBalancerFactory.getLoadBalancer(conf); this.balancer = LoadBalancerFactory.getLoadBalancer(conf);
this.serverManager = new ServerManager(this, new DummyRegionServerListStorage()); this.serverManager = new ServerManager(this, new DummyRegionServerList());
this.tableStateManager = Mockito.mock(TableStateManager.class); this.tableStateManager = Mockito.mock(TableStateManager.class);
Mockito.when(this.tableStateManager.getTableState(Mockito.any())). Mockito.when(this.tableStateManager.getTableState(Mockito.any())).
thenReturn(new TableState(TableName.valueOf("AnyTableNameSetInMockMasterServcies"), thenReturn(new TableState(TableName.valueOf("AnyTableNameSetInMockMasterServcies"),