You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2014/05/23 13:05:40 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8e13fea2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8e13fea2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8e13fea2
Branch: refs/heads/master
Commit: 8e13fea268be3a8709f1b2213af8d5d49638d13a
Parents: f36b42b c61cb7f
Author: Ramkrishna <ra...@intel.com>
Authored: Fri May 23 16:35:11 2014 +0530
Committer: Ramkrishna <ra...@intel.com>
Committed: Fri May 23 16:35:11 2014 +0530
----------------------------------------------------------------------
.../apache/hadoop/hbase/ConsensusProvider.java | 58 ---
.../hadoop/hbase/CoordinatedStateException.java | 46 +++
.../hadoop/hbase/CoordinatedStateManager.java | 66 +++
.../java/org/apache/hadoop/hbase/Server.java | 4 +-
.../apache/hadoop/hbase/TableStateManager.java | 115 ++++++
.../hadoop/hbase/client/AsyncProcess.java | 8 +-
.../hadoop/hbase/client/ClientScanner.java | 46 ++-
.../client/ClientSmallReversedScanner.java | 2 +-
.../hadoop/hbase/client/ClientSmallScanner.java | 28 +-
.../hadoop/hbase/client/ConnectionManager.java | 5 +-
.../org/apache/hadoop/hbase/client/HTable.java | 41 +-
.../hbase/client/MultiServerCallable.java | 9 +-
.../hbase/client/ReversedClientScanner.java | 5 +-
.../hbase/client/ReversedScannerCallable.java | 20 +-
.../hadoop/hbase/client/ScannerCallable.java | 16 +-
.../hadoop/hbase/client/ZooKeeperRegistry.java | 6 +-
.../DelegatingPayloadCarryingRpcController.java | 58 +++
.../org/apache/hadoop/hbase/ipc/RpcClient.java | 5 +-
.../hadoop/hbase/ipc/RpcControllerFactory.java | 59 +++
.../hbase/security/HBaseSaslRpcClient.java | 27 +-
.../apache/hadoop/hbase/security/SaslUtil.java | 32 ++
.../apache/hadoop/hbase/zookeeper/ZKTable.java | 406 -------------------
.../hadoop/hbase/zookeeper/ZKTableReadOnly.java | 167 --------
.../zookeeper/ZKTableStateClientSideReader.java | 168 ++++++++
.../hbase/zookeeper/ZKTableStateManager.java | 330 +++++++++++++++
.../hadoop/hbase/client/TestAsyncProcess.java | 5 +-
.../org/apache/hadoop/hbase/HConstants.java | 3 +-
.../hbase/io/encoding/FastDiffDeltaEncoder.java | 3 +-
.../io/encoding/PrefixKeyDeltaEncoder.java | 3 +-
.../src/main/resources/hbase-default.xml | 6 +-
.../regionserver/MetricsRegionServerSource.java | 2 +-
.../MetricsRegionServerWrapper.java | 2 +-
.../hbase/IntegrationTestIngestWithACL.java | 32 +-
.../hadoop/hbase/ConsensusProviderFactory.java | 43 --
.../hbase/CoordinatedStateManagerFactory.java | 43 ++
.../apache/hadoop/hbase/LocalHBaseCluster.java | 13 +-
.../hbase/consensus/BaseConsensusProvider.java | 49 ---
.../consensus/BaseCoordinatedStateManager.java | 55 +++
.../hbase/consensus/ZkConsensusProvider.java | 42 --
.../consensus/ZkCoordinatedStateManager.java | 59 +++
.../hbase/mapreduce/KeyValueSortReducer.java | 2 +-
.../hadoop/hbase/master/AssignmentManager.java | 109 +++--
.../org/apache/hadoop/hbase/master/HMaster.java | 26 +-
.../hadoop/hbase/master/HMasterCommandLine.java | 13 +-
.../hadoop/hbase/master/SplitLogManager.java | 35 +-
.../master/handler/ClosedRegionHandler.java | 5 +-
.../master/handler/CreateTableHandler.java | 22 +-
.../master/handler/DeleteTableHandler.java | 10 +-
.../master/handler/DisableTableHandler.java | 22 +-
.../master/handler/EnableTableHandler.java | 29 +-
.../master/handler/OpenedRegionHandler.java | 4 +-
.../master/handler/ServerShutdownHandler.java | 12 +-
.../hbase/master/handler/TableEventHandler.java | 11 +-
.../master/handler/TruncateTableHandler.java | 17 +-
.../hbase/master/snapshot/SnapshotManager.java | 11 +-
.../hbase/regionserver/HRegionServer.java | 26 +-
.../regionserver/HRegionServerCommandLine.java | 6 +-
.../MetricsRegionServerWrapperImpl.java | 2 +-
.../hbase/regionserver/SplitLogWorker.java | 5 +-
.../hbase/regionserver/wal/HLogSplitter.java | 28 +-
.../regionserver/wal/WALEditsReplaySink.java | 5 +-
.../regionserver/ReplicationSyncUp.java | 6 +-
.../hbase/security/HBaseSaslRpcServer.java | 33 +-
.../security/access/SecureBulkLoadEndpoint.java | 6 +-
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 4 +-
.../hadoop/hbase/util/JVMClusterUtil.java | 10 +-
.../apache/hadoop/hbase/io/hfile/package.html | 25 --
.../hadoop/hbase/HBaseTestingUtility.java | 8 +-
.../apache/hadoop/hbase/MiniHBaseCluster.java | 2 +-
.../hadoop/hbase/MockRegionServerServices.java | 2 +-
.../apache/hadoop/hbase/TestDrainingServer.java | 15 +-
.../hadoop/hbase/TestLocalHBaseCluster.java | 4 +-
.../hbase/client/HConnectionTestingUtility.java | 6 +-
.../apache/hadoop/hbase/client/TestAdmin.java | 19 +-
.../client/TestClientScannerRPCTimeout.java | 4 +-
.../hbase/client/TestRpcControllerFactory.java | 203 ++++++++++
.../hadoop/hbase/io/hfile/TestCacheConfig.java | 176 ++++++++
.../hadoop/hbase/master/MockRegionServer.java | 4 +-
.../hbase/master/TestActiveMasterManager.java | 4 +-
.../hbase/master/TestAssignmentManager.java | 115 ++++--
.../master/TestAssignmentManagerOnCluster.java | 9 +-
.../hadoop/hbase/master/TestCatalogJanitor.java | 6 +-
.../hbase/master/TestClockSkewDetection.java | 4 +-
.../hbase/master/TestHMasterRPCException.java | 6 +-
.../apache/hadoop/hbase/master/TestMaster.java | 4 +-
.../hadoop/hbase/master/TestMasterFailover.java | 18 +-
.../hadoop/hbase/master/TestMasterMetrics.java | 4 +-
.../hbase/master/TestMasterNoCluster.java | 13 +-
.../TestMasterRestartAfterDisablingTable.java | 10 +-
.../hbase/master/TestOpenedRegionHandler.java | 4 +-
.../hbase/master/TestSplitLogManager.java | 45 --
.../hbase/master/cleaner/TestHFileCleaner.java | 4 +-
.../master/cleaner/TestHFileLinkCleaner.java | 4 +-
.../hbase/master/cleaner/TestLogsCleaner.java | 4 +-
.../MetricsRegionServerWrapperStub.java | 2 +-
.../hbase/regionserver/OOMERegionServer.java | 4 +-
.../hbase/regionserver/TestClusterId.java | 6 +-
.../regionserver/TestHeapMemoryManager.java | 4 +-
.../regionserver/TestMetricsRegionServer.java | 2 +-
.../hbase/regionserver/TestPriorityRpc.java | 6 +-
.../TestRSKilledWhenInitializing.java | 4 +-
.../TestRegionMergeTransaction.java | 10 +-
.../regionserver/TestReversibleScanners.java | 47 ++-
.../TestSplitTransactionOnCluster.java | 4 +-
.../hbase/regionserver/wal/TestHLogMethods.java | 2 +-
.../hbase/regionserver/wal/TestHLogSplit.java | 8 +-
.../hbase/regionserver/wal/TestWALReplay.java | 4 +-
.../replication/TestReplicationStateZKImpl.java | 4 +-
.../TestReplicationTrackerZKImpl.java | 4 +-
.../TestReplicationSourceManager.java | 4 +-
.../hbase/security/TestHBaseSaslRpcClient.java | 18 +
.../security/token/TestTokenAuthentication.java | 4 +-
.../apache/hadoop/hbase/util/LoadTestTool.java | 93 ++++-
.../apache/hadoop/hbase/util/MockServer.java | 4 +-
.../hbase/util/MultiThreadedReaderWithACL.java | 7 +-
.../hbase/util/MultiThreadedUpdaterWithACL.java | 19 +-
.../hadoop/hbase/zookeeper/TestZKTable.java | 110 -----
.../zookeeper/TestZKTableStateManager.java | 114 ++++++
src/main/docbkx/developer.xml | 108 +++--
119 files changed, 2391 insertions(+), 1469 deletions(-)
----------------------------------------------------------------------