diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ConsensusProvider.java hbase-client/src/main/java/org/apache/hadoop/hbase/ConsensusProvider.java new file mode 100644 index 0000000..09870d2 --- /dev/null +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ConsensusProvider.java @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase; + +import org.apache.hadoop.classification.InterfaceAudience; + +/** + * Implementations of this interface will keep and return to clients + * implementations of classes providing API to execute + * coordinated operations. This interface is client-sise, so it does NOT + * include method to retrieve the particular consensus providers. + * + * For each coarse-grained area of operations there will be a separate + * interface with implementation, providing API for relevant operations + * requiring coordination. + * + * Property hbase.consensus.provider.class in hbase-site.xml controls + * which provider to use. + */ +@InterfaceAudience.Private +public interface ConsensusProvider { + + /** + * Initialize consensus service. + * @param server server instance to run within. + */ + void initialize(Server server); + + /** + * Starts consensus service. + */ + void start(); + + /** + * Stop consensus provider. + */ + void stop(); + + /** + * @return instance of Server consensus runs within + */ + Server getServer(); +} diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java index e506e5b..9966962 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java @@ -48,4 +48,9 @@ public interface Server extends Abortable, Stoppable { * @return The unique server name for this server. */ ServerName getServerName(); + + /** + * Get ConsensusProvider instance for this server. + */ + ConsensusProvider getConsensusProvider(); } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/ConsensusProviderFactory.java hbase-server/src/main/java/org/apache/hadoop/hbase/ConsensusProviderFactory.java new file mode 100644 index 0000000..87cd9ff --- /dev/null +++ hbase-server/src/main/java/org/apache/hadoop/hbase/ConsensusProviderFactory.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.consensus.ZkConsensusProvider; +import org.apache.hadoop.util.ReflectionUtils; + +/** + * Creates instance of {@link ConsensusProvider} + * based on configuration. + */ +@InterfaceAudience.Private +public class ConsensusProviderFactory { + + /** + * Creates consensus provider from the given configuration. + * @param conf Configuration + * @return A {@link ConsensusProvider} + */ + public static ConsensusProvider getConsensusProvider(Configuration conf) { + Class consensusKlass = + conf.getClass(HConstants.HBASE_CONSENSUS_PROVIDER_CLASS, ZkConsensusProvider.class, + ConsensusProvider.class); + return ReflectionUtils.newInstance(consensusKlass, conf); + } +} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 8550367..8172fdc 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -30,8 +30,6 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java new file mode 100644 index 0000000..03f5fca --- /dev/null +++ hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java @@ -0,0 +1,49 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.consensus; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.Server; + +/** + * Base class for {@link org.apache.hadoop.hbase.ConsensusProvider} implementations. + * Defines methods to retrieve consensus objects for relevant areas. ConsensusProvider + * reference returned from Server interface has to be casted to this type to + * access those methods. + */ +@InterfaceAudience.Private +public abstract class BaseConsensusProvider implements ConsensusProvider { + + @Override + public void initialize(Server server) { + } + + @Override + public void start() { + } + + @Override + public void stop() { + } + + @Override + public Server getServer() { + return null; + } +} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProvider.java hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProvider.java deleted file mode 100644 index bc95337..0000000 --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.consensus; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.hbase.Server; - -/** - * Implementations of this interface will keep and return to clients - * implementations of classes providing API to execute - * coordinated operations. - * - * For each coarse-grained area of operations there will be a separate - * interface with implementation, providing API for relevant operations - * requiring coordination. - * - * Property hbase.consensus.provider.class in hbase-site.xml controls - * which provider to use. - */ -@InterfaceAudience.Private -public interface ConsensusProvider { - - /** - * Initialize consensus service. - * @param server server instance to run within. - */ - void initialize(Server server); - - /** - * Starts consensus service. - */ - void start(); - - /** - * Stop consensus provider. - */ - void stop(); - - /** - * @return instance of Server consensus runs within - */ - Server getServer(); -} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProviderFactory.java hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProviderFactory.java deleted file mode 100644 index 3429e04..0000000 --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProviderFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.consensus; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.util.ReflectionUtils; - -/** - * Creates instance of {@link org.apache.hadoop.hbase.consensus.ConsensusProvider} - * based on configuration. - */ -@InterfaceAudience.Private -public class ConsensusProviderFactory { - - /** - * Creates consensus provider from the given configuration. - * @param conf Configuration - * @return A {@link org.apache.hadoop.hbase.consensus.ConsensusProvider} - */ - public static ConsensusProvider getConsensusProvider(Configuration conf) { - Class consensusKlass = - conf.getClass(HConstants.HBASE_CONSENSUS_PROVIDER_CLASS, ZkConsensusProvider.class, - ConsensusProvider.class); - return ReflectionUtils.newInstance(consensusKlass, conf); - } -} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java index 09f6191..56175ae 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java @@ -22,13 +22,13 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; /** - * ZooKeeper-based implementation of {@link ConsensusProvider}. + * ZooKeeper-based implementation of {@link org.apache.hadoop.hbase.ConsensusProvider}. */ @InterfaceAudience.Private -public class ZkConsensusProvider implements ConsensusProvider { +public class ZkConsensusProvider extends BaseConsensusProvider { private Server server; private ZooKeeperWatcher watcher; - + @Override public void initialize(Server server) { this.server = server; @@ -36,14 +36,6 @@ public class ZkConsensusProvider implements ConsensusProvider { } @Override - public void start() { - } - - @Override - public void stop() { - } - - @Override public Server getServer() { return server; } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 2d6a6e7..1c0ca3c 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -68,7 +68,7 @@ import org.apache.hadoop.hbase.client.MetaScanner; import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitor; import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitorBase; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.executor.ExecutorType; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java index fda77c6..c4cf6e5 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java @@ -36,8 +36,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.LocalHBaseCluster; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.ServerCommandLine; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 14a5a93..267853b 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -75,8 +75,8 @@ import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.client.ConnectionUtils; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionManager; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.exceptions.RegionMovedException; import org.apache.hadoop.hbase.exceptions.RegionOpeningException; @@ -2146,6 +2146,7 @@ public class HRegionServer extends HasThread implements return zooKeeper; } + @Override public ConsensusProvider getConsensusProvider() { return consensusProvider; } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java index 74b24f0..0385238 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java @@ -25,8 +25,8 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.LocalHBaseCluster; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.util.ServerCommandLine; /** diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java index 59b7f07..9f5afb6 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.replication.regionserver.Replication; import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -145,6 +146,11 @@ public class ReplicationSyncUp extends Configured implements Tool { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java index 94e929c..fbff3ab 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.util.ReflectionUtils; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java index e52ab82..638d0c2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -30,7 +30,6 @@ import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hbase.client.HConnectionManager; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java index 1630b0d..3a1e0f3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java @@ -135,6 +135,11 @@ class MockRegionServerServices implements RegionServerServices { return zkw; } + @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + public RegionServerAccounting getRegionServerAccounting() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java index 94457c9..7f9501b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java @@ -22,7 +22,6 @@ import static org.junit.Assert.*; import java.io.IOException; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; import org.apache.hadoop.hbase.master.HMaster; import org.apache.zookeeper.KeeperException; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java index 3b1d93d..e35c618 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcServer; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java index c98aad4..0489ead 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcServerInterface; @@ -268,6 +269,11 @@ ClientProtos.ClientService.BlockingInterface, RegionServerServices { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { // TODO Auto-generated method stub return null; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java index 994a26e..326b1a2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.monitoring.MonitoredTask; import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; @@ -281,6 +282,11 @@ public class TestActiveMasterManager { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public ServerName getServerName() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java index b0d3acd..20fbc0f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java @@ -50,8 +50,8 @@ import org.apache.hadoop.hbase.catalog.MetaMockingUtil; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionTestingUtility; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.executor.EventType; import org.apache.hadoop.hbase.executor.ExecutorService; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java index 966e759..0344cef 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java @@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ObserverContext; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index 2dc0eaf..5bbcd43 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.client.HConnectionTestingUtility; import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.io.Reference; import org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator; @@ -164,6 +165,11 @@ public class TestCatalogJanitor { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public void abort(String why, Throwable e) { //no-op } @@ -243,6 +249,11 @@ public class TestCatalogJanitor { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java index 24703c3..a4baf63 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java @@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -61,6 +62,11 @@ public class TestClockSkewDetection { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public void abort(String why, Throwable e) {} @Override diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java index 6f3fdcd..00a42a2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java @@ -26,8 +26,8 @@ import java.net.SocketTimeoutException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java index 7e6e814..d03d2ae 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java @@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java index b697866..badc3ce 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java @@ -46,8 +46,8 @@ import org.apache.hadoop.hbase.catalog.MetaMockingUtil; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionTestingUtility; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.monitoring.MonitoredTask; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java index 7842be4..d44a3dc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.util.EnvironmentEdge; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -209,6 +210,11 @@ public class TestHFileCleaner { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java index 6d9ca4c..55a8ff6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.io.HFileLink; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileArchiveUtil; @@ -145,6 +146,11 @@ public class TestHFileLinkCleaner { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java index d203b58..e17e7e2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java @@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.replication.ReplicationFactory; import org.apache.hadoop.hbase.replication.ReplicationQueues; import org.apache.hadoop.hbase.replication.regionserver.Replication; @@ -151,6 +152,11 @@ public class TestLogsCleaner { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java index 359958c..65bcbaa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java index c76b7be..3ee4c33 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java @@ -30,8 +30,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.JVMClusterUtil; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java index 6dfe7c6..cc604cc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.io.hfile.BlockCacheColumnFamilySummary; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; import org.apache.hadoop.hbase.io.hfile.CacheStats; @@ -418,6 +419,11 @@ public class TestHeapMemoryManager { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java index d29d56f..fee7d59 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java @@ -29,8 +29,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.ipc.PriorityFunction; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java index c65414f..6d27242 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.LocalHBaseCluster; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java index b35dbfa..5caa28d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java @@ -42,8 +42,8 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; -import org.apache.hadoop.hbase.consensus.ConsensusProviderFactory; +import org.apache.hadoop.hbase.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProviderFactory; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.util.Bytes; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 4cf622d..2107f75 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -65,7 +65,7 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.consensus.ConsensusProvider; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java index 3ef57a5..2d00030 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java @@ -30,6 +30,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -142,6 +143,11 @@ public class TestReplicationStateZKImpl extends TestReplicationStateBasic { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java index d073726..6a68cbf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -218,6 +219,11 @@ public class TestReplicationTrackerZKImpl { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java index b9e4d8f..035d609 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java @@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; @@ -391,6 +392,11 @@ public class TestReplicationSourceManager { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; // To change body of implemented methods use File | Settings | File Templates. } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java index baf9cf4..3a8fee9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.client.HTableInterface; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.FifoRpcScheduler; @@ -153,6 +154,11 @@ public class TestTokenAuthentication { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public boolean isAborted() { return aborted; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java index 21671d1..1453a5c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.ConsensusProvider; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; /** @@ -95,6 +96,11 @@ public class MockServer implements Server { } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public CatalogTracker getCatalogTracker() { return null; }