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:58:10 UTC
hbase git commit: HBASE-19815 Flakey
TestAssignmentManager.testAssignWithRandExec
Repository: hbase
Updated Branches:
refs/heads/master c1a8dc09d -> 53d0c2388
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/53d0c238
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/53d0c238
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/53d0c238
Branch: refs/heads/master
Commit: 53d0c2388d9eb564c20e4231d3cb7ae7be360478
Parents: c1a8dc0
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:52:39 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/master/procedure/RecoverMetaProcedure.java | 6 +++---
.../apache/hadoop/hbase/master/MockNoopMasterServices.java | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/53d0c238/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/53d0c238/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 7196b7c..48e9e8d 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
@@ -28,7 +28,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;
@@ -58,7 +57,9 @@ import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
-public class MockNoopMasterServices implements MasterServices, Server {
+import com.google.protobuf.Service;
+
+public class MockNoopMasterServices implements MasterServices {
private final Configuration conf;
private final MetricsMaster metricsMaster;
@@ -480,4 +481,4 @@ public class MockNoopMasterServices implements MasterServices, Server {
public ReplicationPeerManager getReplicationPeerManager() {
return null;
}
-}
\ No newline at end of file
+}