You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/01/17 21:50:51 UTC
[2/2] hbase git commit: HBASE-19815 Flakey
TestAssignmentManager.testAssignWithRandExec
HBASE-19815 Flakey TestAssignmentManager.testAssignWithRandExec
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f5b0fb7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f5b0fb7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f5b0fb7
Branch: refs/heads/branch-2
Commit: 0f5b0fb759f3c191f5a5fa83d61c77ed70c61847
Parents: 5e4ed33
Author: Michael Stack <st...@apache.org>
Authored: Wed Jan 17 10:56:50 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Wed Jan 17 13:50:42 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/master/procedure/RecoverMetaProcedure.java | 6 +++---
.../org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f5b0fb7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java
index 6aa7fff..50ef3e0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RecoverMetaProcedure.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
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.procedure2.ProcedureStateSerializer;
import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException;
@@ -58,7 +58,7 @@ public class RecoverMetaProcedure
private int replicaId;
private final ProcedurePrepareLatch syncLatch;
- private HMaster master;
+ private MasterServices master;
/**
* 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) {
if (master == null) {
- master = (HMaster) env.getMasterServices();
+ master = env.getMasterServices();
Preconditions.checkArgument(master != null);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f5b0fb7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
----------------------------------------------------------------------
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 7b6af0e..be91aa0 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
@@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.CoordinatedStateManager;
-import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors;
import org.apache.hadoop.hbase.TableName;
@@ -57,7 +56,7 @@ import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import com.google.protobuf.Service;
-public class MockNoopMasterServices implements MasterServices, Server {
+public class MockNoopMasterServices implements MasterServices {
private final Configuration conf;
private final MetricsMaster metricsMaster;