Index: hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProvider.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProvider.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ConsensusProvider.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.consensus; +package org.apache.hadoop.hbase; 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. + * 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 Index: hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -48,4 +48,9 @@ * @return The unique server name for this server. */ ServerName getServerName(); + + /** + * Get ConsensusProvider instance for this server. + */ + ConsensusProvider getConsensusProvider(); } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProviderFactory.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ConsensusProviderFactory.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/ConsensusProviderFactory.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.consensus; +package org.apache.hadoop.hbase; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.consensus.ZkConsensusProvider; import org.apache.hadoop.util.ReflectionUtils; /** - * Creates instance of {@link org.apache.hadoop.hbase.consensus.ConsensusProvider} + * Creates instance of {@link ConsensusProvider} * based on configuration. */ @InterfaceAudience.Private @@ -32,7 +32,7 @@ /** * Creates consensus provider from the given configuration. * @param conf Configuration - * @return A {@link org.apache.hadoop.hbase.consensus.ConsensusProvider} + * @return A {@link ConsensusProvider} */ public static ConsensusProvider getConsensusProvider(Configuration conf) { Class consensusKlass = Index: hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/BaseConsensusProvider.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -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; + } +} Index: hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/consensus/ZkConsensusProvider.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -22,25 +22,17 @@ 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; this.watcher = server.getZooKeeper(); - } - - @Override - public void start() { - } - - @Override - public void stop() { } @Override Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -75,8 +75,8 @@ 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 @@ return zooKeeper; } + @Override public ConsensusProvider getConsensusProvider() { return consensusProvider; } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -29,6 +29,7 @@ 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; @@ -142,6 +143,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return zkw; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -135,6 +135,11 @@ return zkw; } + @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + public RegionServerAccounting getRegionServerAccounting() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -39,6 +39,7 @@ 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; @@ -265,6 +266,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return this.zkw; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -33,6 +33,7 @@ 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; @@ -277,6 +278,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -56,6 +56,7 @@ 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 @@ } @Override + public ConsensusProvider getConsensusProvider() { + return null; + } + + @Override public void abort(String why, Throwable e) { //no-op } @@ -239,6 +245,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -27,6 +27,7 @@ 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; @@ -57,6 +58,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -35,6 +35,7 @@ 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; @@ -205,6 +206,11 @@ } catch (IOException e) { e.printStackTrace(); } + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -34,6 +34,7 @@ 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; @@ -141,6 +142,11 @@ } catch (IOException e) { e.printStackTrace(); } + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -28,6 +28,7 @@ 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; @@ -147,6 +148,11 @@ } catch (IOException e) { e.printStackTrace(); } + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -33,6 +33,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.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; @@ -414,6 +415,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { + return null; + } + + @Override + public ConsensusProvider getConsensusProvider() { return null; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -30,6 +30,7 @@ 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; @@ -139,6 +140,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return zkw; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -32,6 +32,7 @@ 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; @@ -215,6 +216,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return zkw; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -48,6 +48,7 @@ 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; @@ -388,6 +389,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return zkw; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -43,6 +43,7 @@ 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; @@ -150,6 +151,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return zookeeper; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java (revision cbd278b45328ed39e143885d4dc2a48f3409af05) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java (revision ea044ecab8b1a2d87e48e1b8f5456e5831e5a280) @@ -27,6 +27,7 @@ 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; /** @@ -92,6 +93,11 @@ @Override public ZooKeeperWatcher getZooKeeper() { return this.zk; + } + + @Override + public ConsensusProvider getConsensusProvider() { + return null; } @Override Index: hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java (date 1398814742000) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java (date 1398929002000) @@ -30,8 +30,6 @@ 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; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (date 1398814742000) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (date 1398929002000) @@ -68,7 +68,7 @@ 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; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (date 1398814742000) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (date 1398929002000) @@ -36,8 +36,8 @@ 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; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java (date 1398814742000) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java (date 1398929002000) @@ -25,8 +25,8 @@ 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; /** Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java (date 1398814742000) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java (date 1398929002000) @@ -29,7 +29,7 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java (date 1398929002000) @@ -30,7 +30,6 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java (date 1398929002000) @@ -22,7 +22,6 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java (date 1398929002000) @@ -30,7 +30,7 @@ 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; \ No newline at end of file Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (date 1398929002000) @@ -50,8 +50,8 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java (date 1398929002000) @@ -48,7 +48,7 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java (date 1398929002000) @@ -26,8 +26,8 @@ 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; \ No newline at end of file Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java (date 1398929002000) @@ -27,7 +27,7 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (date 1398929002000) @@ -46,8 +46,8 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java (date 1398929002000) @@ -25,7 +25,7 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java (date 1398929002000) @@ -30,8 +30,8 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (date 1398929002000) @@ -29,8 +29,8 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java (date 1398929002000) @@ -32,7 +32,7 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java (date 1398929002000) @@ -42,8 +42,8 @@ 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; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (date 1398814742000) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (date 1398929002000) @@ -65,7 +65,7 @@ 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;