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

HBASE-19815 Flakey TestAssignmentManager.testAssignWithRandExec

This commit is contained in:
Michael Stack 2018-01-17 10:56:50 -08:00
parent 5e4ed33fa2
commit 0f5b0fb759
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java
View File

@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder; import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.MasterServices;
import org.apache.hadoop.hbase.master.assignment.AssignProcedure; import org.apache.hadoop.hbase.master.assignment.AssignProcedure;
import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException; import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException;
@ -58,7 +58,7 @@ public class RecoverMetaProcedure
private int replicaId; private int replicaId;
private final ProcedurePrepareLatch syncLatch; private final ProcedurePrepareLatch syncLatch;
private HMaster master; private MasterServices master;
/** /**
* Call this constructor to queue up a {@link RecoverMetaProcedure} in response to meta * Call this constructor to queue up a {@link RecoverMetaProcedure} in response to meta
@ -250,7 +250,7 @@ public class RecoverMetaProcedure
*/ */
private void prepare(MasterProcedureEnv env) { private void prepare(MasterProcedureEnv env) {
if (master == null) { if (master == null) {
master = (HMaster) env.getMasterServices(); master = env.getMasterServices();
Preconditions.checkArgument(master != null); Preconditions.checkArgument(master != null);
} }
} }

3
hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
View File

@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.ChoreService; import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.CoordinatedStateManager;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors; import org.apache.hadoop.hbase.TableDescriptors;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
@ -57,7 +56,7 @@ import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import com.google.protobuf.Service; import com.google.protobuf.Service;
public class MockNoopMasterServices implements MasterServices, Server { public class MockNoopMasterServices implements MasterServices {
private final Configuration conf; private final Configuration conf;
private final MetricsMaster metricsMaster; private final MetricsMaster metricsMaster;