hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject [3/5] hbase git commit: Merge branch 'branch-1' of https://git-wip-us.apache.org/repos/asf/hbase into branch-1
Date Tue, 05 Jan 2016 23:55:41 GMT
Merge branch 'branch-1' of https://git-wip-us.apache.org/repos/asf/hbase into branch-1


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/254af5a3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/254af5a3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/254af5a3

Branch: refs/heads/branch-1
Commit: 254af5a3210e5b3cec09b73aa2bff31a1d9e3d80
Parents: fba9e49 407cda4
Author: Lars Hofhansl <larsh@apache.org>
Authored: Tue Jan 5 15:54:49 2016 -0800
Committer: Lars Hofhansl <larsh@apache.org>
Committed: Tue Jan 5 15:54:49 2016 -0800

----------------------------------------------------------------------
 dev-support/findHangingTest.sh                  |   40 -
 dev-support/findHangingTests.py                 |   82 +
 dev-support/jenkinsEnv.sh                       |    2 +-
 dev-support/test-patch.sh                       |  350 ++--
 dev-support/zombie-detector.sh                  |  166 ++
 hbase-assembly/src/main/assembly/src.xml        |    3 +-
 .../resources/hbase/checkstyle-suppressions.xml |    1 +
 .../hadoop/hbase/MultiActionResultTooLarge.java |   35 +
 .../hadoop/hbase/RetryImmediatelyException.java |   31 +
 .../hadoop/hbase/client/AsyncProcess.java       |   89 +-
 .../hadoop/hbase/client/ClientScanner.java      |    4 +-
 .../hadoop/hbase/client/ConnectionManager.java  |    4 +-
 .../hbase/client/FlushRegionCallable.java       |    7 +-
 .../org/apache/hadoop/hbase/client/HTable.java  |    4 +-
 .../apache/hadoop/hbase/client/Mutation.java    |    2 +-
 .../org/apache/hadoop/hbase/client/Result.java  |    3 +
 .../RpcRetryingCallerWithReadReplicas.java      |    2 +-
 .../hadoop/hbase/client/ScannerCallable.java    |   12 +-
 .../client/ScannerCallableWithReplicas.java     |    4 +
 .../client/replication/ReplicationAdmin.java    |   27 +-
 .../hadoop/hbase/filter/FuzzyRowFilter.java     |    6 +-
 .../hadoop/hbase/ipc/AbstractRpcClient.java     |   39 +-
 .../apache/hadoop/hbase/ipc/AsyncRpcClient.java |    5 +-
 .../apache/hadoop/hbase/ipc/RpcClientImpl.java  |  102 +-
 .../hadoop/hbase/ipc/RpcControllerFactory.java  |   26 +-
 .../hadoop/hbase/protobuf/ProtobufUtil.java     |   18 +-
 .../hadoop/hbase/protobuf/RequestConverter.java |    4 +-
 .../replication/ReplicationPeerZKImpl.java      |   20 +-
 .../hbase/replication/ReplicationPeers.java     |    2 +-
 .../replication/ReplicationPeersZKImpl.java     |   33 +-
 .../hbase/replication/ReplicationQueues.java    |   25 +-
 .../replication/ReplicationQueuesClient.java    |   25 +-
 .../ReplicationQueuesClientZKImpl.java          |   37 +
 .../replication/ReplicationQueuesZKImpl.java    |   70 +
 .../replication/ReplicationStateZKBase.java     |   17 +-
 .../apache/hadoop/hbase/zookeeper/ZKConfig.java |  350 ----
 .../apache/hadoop/hbase/zookeeper/ZKUtil.java   |  148 +-
 .../hadoop/hbase/zookeeper/TestZKUtil.java      |   11 -
 .../org/apache/hadoop/hbase/ChoreService.java   |    2 +-
 .../apache/hadoop/hbase/HBaseConfiguration.java |   83 +-
 .../org/apache/hadoop/hbase/HConstants.java     |   16 +-
 .../org/apache/hadoop/hbase/ScheduledChore.java |   12 +-
 .../hbase/io/hfile/HFileContextBuilder.java     |    2 +-
 .../org/apache/hadoop/hbase/util/Bytes.java     |   46 +-
 .../apache/hadoop/hbase/util/UnsafeAccess.java  |   19 +
 .../apache/hadoop/hbase/zookeeper/ZKConfig.java |  495 +++++
 .../src/main/resources/hbase-default.xml        |    6 +-
 .../hadoop/hbase/HBaseCommonTestingUtility.java |    6 +
 .../apache/hadoop/hbase/TestClassFinder.java    |   18 +-
 .../hadoop/hbase/TestHBaseConfiguration.java    |   10 +-
 .../hadoop/hbase/zookeeper/TestZKConfig.java    |  126 ++
 .../hbase/io/hfile/MemcachedBlockCache.java     |   10 +-
 .../hbase/ipc/MetricsHBaseServerSource.java     |    8 +-
 .../MetricsReplicationSinkSource.java           |    2 +
 .../MetricsReplicationSourceSource.java         |    6 +
 .../hbase/ipc/MetricsHBaseServerSourceImpl.java |    9 +
 .../MetricsReplicationGlobalSourceSource.java   |   21 +
 .../MetricsReplicationSinkSourceImpl.java       |    7 +
 .../MetricsReplicationSourceSourceImpl.java     |   28 +
 .../hbase/IntegrationTestDDLMasterFailover.java |   16 +-
 .../procedure2/store/ProcedureStoreTracker.java |   21 +-
 .../procedure2/store/wal/WALProcedureStore.java |  294 +--
 .../hbase/procedure2/TestProcedureRecovery.java |    4 +-
 .../store/TestProcedureStoreTracker.java        |   35 +-
 .../store/wal/TestWALProcedureStore.java        |   51 +-
 .../hbase/protobuf/generated/AdminProtos.java   |  602 +++++-
 .../hbase/protobuf/generated/ClientProtos.java  |  218 ++-
 .../hbase/protobuf/generated/HBaseProtos.java   |  211 ++-
 hbase-protocol/src/main/protobuf/Admin.proto    |    3 +
 hbase-protocol/src/main/protobuf/Client.proto   |    1 +
 hbase-protocol/src/main/protobuf/HBase.proto    |    2 +
 .../master/AssignmentManagerStatusTmpl.jamon    |    3 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.jamon  |    3 +-
 .../tmpl/regionserver/RegionListTmpl.jamon      |   20 +-
 .../tmpl/regionserver/ServerMetricsTmpl.jamon   |    8 +-
 .../hbase/client/ClientSideRegionScanner.java   |    9 +-
 .../hadoop/hbase/client/VersionInfoUtil.java    |   71 +
 .../hbase/coprocessor/CoprocessorHost.java      |   24 +-
 .../hadoop/hbase/executor/EventHandler.java     |    7 +-
 .../hadoop/hbase/io/hfile/CacheStats.java       |    7 +-
 .../hbase/io/hfile/CombinedBlockCache.java      |   48 +-
 .../hadoop/hbase/ipc/MetricsHBaseServer.java    |    9 +
 .../apache/hadoop/hbase/ipc/RpcCallContext.java |   26 +-
 .../org/apache/hadoop/hbase/ipc/RpcServer.java  |   62 +-
 .../hbase/mapreduce/LoadIncrementalHFiles.java  |  217 ++-
 .../hadoop/hbase/mapreduce/SyncTable.java       |   15 +-
 .../hbase/mapreduce/TableMapReduceUtil.java     |   35 +-
 .../hbase/mapreduce/TableOutputFormat.java      |   22 +-
 .../replication/VerifyReplication.java          |   25 +-
 .../hadoop/hbase/master/AssignmentManager.java  |   46 +-
 .../hbase/master/TableNamespaceManager.java     |    8 +-
 .../normalizer/SimpleRegionNormalizer.java      |  110 +-
 .../master/procedure/ProcedurePrepareLatch.java |   23 +-
 .../hbase/protobuf/ReplicationProtbufUtil.java  |   46 +-
 .../hbase/regionserver/CompactSplitThread.java  |   46 +-
 .../hadoop/hbase/regionserver/HRegion.java      |   44 +-
 .../hbase/regionserver/RSRpcServices.java       |  186 +-
 .../regionserver/ReplicationSinkService.java    |    8 +-
 .../handler/RegionReplicaFlushHandler.java      |    4 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |   21 +-
 .../regionserver/wal/WALActionsListener.java    |   19 +-
 .../hadoop/hbase/regionserver/wal/WALEdit.java  |   14 +-
 .../hbase/replication/ScopeWALEntryFilter.java  |   71 +-
 .../replication/TableCfWALEntryFilter.java      |   77 +-
 .../master/ReplicationHFileCleaner.java         |  193 ++
 .../DefaultSourceFSConfigurationProvider.java   |   78 +
 .../HBaseInterClusterReplicationEndpoint.java   |   65 +-
 .../regionserver/HFileReplicator.java           |  393 ++++
 .../replication/regionserver/MetricsSink.java   |   13 +-
 .../replication/regionserver/MetricsSource.java |   31 +
 .../RegionReplicaReplicationEndpoint.java       |    4 +-
 .../replication/regionserver/Replication.java   |  138 +-
 .../regionserver/ReplicationSink.java           |  200 +-
 .../regionserver/ReplicationSinkManager.java    |   21 +-
 .../regionserver/ReplicationSource.java         |   92 +-
 .../ReplicationSourceInterface.java             |   13 +
 .../regionserver/ReplicationSourceManager.java  |   21 +
 .../SourceFSConfigurationProvider.java          |   40 +
 .../security/access/SecureBulkLoadEndpoint.java |   18 +-
 .../token/AuthenticationTokenSecretManager.java |   21 +
 .../hbase/security/token/ZKSecretWatcher.java   |   25 +
 .../hadoop/hbase/snapshot/ExportSnapshot.java   |   33 +-
 .../util/BoundedConcurrentLinkedQueue.java      |  122 --
 .../hbase/util/ServerRegionReplicaUtil.java     |    4 +-
 .../hbase/wal/RegionGroupingProvider.java       |    2 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java    |   20 +-
 .../hbase-webapps/regionserver/region.jsp       |  129 ++
 .../hbase-webapps/regionserver/storeFile.jsp    |  115 ++
 .../hadoop/hbase/HBaseTestingUtility.java       |   10 +
 .../org/apache/hadoop/hbase/TestZooKeeper.java  |   65 -
 .../hbase/client/TestFromClientSide3.java       |   25 -
 .../hbase/client/TestHBaseAdminNoCluster.java   |   10 +-
 .../hadoop/hbase/client/TestLeaseRenewal.java   |  133 ++
 .../hbase/client/TestMultiRespectsLimits.java   |  177 ++
 .../hbase/client/TestRpcControllerFactory.java  |   17 +-
 .../replication/TestReplicationAdmin.java       |   36 +-
 .../TestReplicationAdminWithClusters.java       |   51 +-
 .../hbase/executor/TestExecutorService.java     |   43 +-
 .../io/encoding/TestDataBlockEncoders.java      |   16 +-
 .../hbase/io/hfile/TestCombinedBlockCache.java  |   98 +
 .../hadoop/hbase/ipc/AbstractTestIPC.java       |   18 +
 .../mapred/TestTableSnapshotInputFormat.java    |    4 +-
 .../MultiTableInputFormatTestBase.java          |    7 +-
 .../TableSnapshotInputFormatTestBase.java       |    7 +-
 .../hadoop/hbase/mapreduce/TestCellCounter.java |    3 +-
 .../hadoop/hbase/mapreduce/TestCopyTable.java   |    3 +-
 .../hbase/mapreduce/TestHFileOutputFormat.java  |   11 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java |   11 +-
 .../hbase/mapreduce/TestHRegionPartitioner.java |    3 +-
 .../hadoop/hbase/mapreduce/TestHashTable.java   |    3 +-
 .../hbase/mapreduce/TestImportExport.java       |    3 +-
 .../TestImportTSVWithOperationAttributes.java   |    4 +-
 .../hbase/mapreduce/TestImportTSVWithTTLs.java  |    3 +-
 .../TestImportTSVWithVisibilityLabels.java      |    4 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java   |    3 +-
 .../mapreduce/TestLoadIncrementalHFiles.java    |   68 +-
 ...oadIncrementalHFilesUseSecurityEndPoint.java |    6 +
 .../mapreduce/TestMultiTableInputFormat.java    |    7 +-
 .../mapreduce/TestMultithreadedTableMapper.java |    3 +-
 .../hadoop/hbase/mapreduce/TestRowCounter.java  |    3 +-
 .../TestSecureLoadIncrementalHFiles.java        |    5 +
 .../hadoop/hbase/mapreduce/TestSyncTable.java   |    3 +-
 .../hbase/mapreduce/TestTableInputFormat.java   |    4 +-
 .../mapreduce/TestTableInputFormatScanBase.java |    4 +-
 .../hbase/mapreduce/TestTableMapReduceBase.java |    3 +-
 .../mapreduce/TestTableSnapshotInputFormat.java |    4 +-
 .../hbase/mapreduce/TestTimeRangeMapRed.java    |    3 +-
 .../hadoop/hbase/mapreduce/TestWALPlayer.java   |    3 +-
 .../balancer/TestStochasticLoadBalancer.java    |  532 ++++++
 .../cleaner/TestReplicationHFileCleaner.java    |  264 +++
 .../normalizer/TestSimpleRegionNormalizer.java  |   43 +-
 .../regionserver/TestCompactSplitThread.java    |  104 +
 .../hadoop/hbase/regionserver/TestHRegion.java  |   26 +-
 .../regionserver/TestHRegionOnCluster.java      |   21 +-
 .../hbase/regionserver/TestRSStatusServlet.java |   10 +
 .../regionserver/TestRegionServerNoMaster.java  |    7 +-
 .../regionserver/TestSplitWalDataLoss.java      |    7 +-
 .../replication/ReplicationSourceDummy.java     |    8 +
 .../replication/TestMasterReplication.java      |  312 ++-
 .../replication/TestReplicationEndpoint.java    |   10 +-
 .../replication/TestReplicationSmallTests.java  |    3 +-
 .../replication/TestReplicationStateBasic.java  |   61 +-
 .../replication/TestReplicationStateZKImpl.java |    6 +-
 .../replication/TestReplicationSyncUpTool.java  |   10 +-
 ...ReplicationSyncUpToolWithBulkLoadedData.java |  235 +++
 .../TestRegionReplicaReplicationEndpoint.java   |    8 +-
 .../regionserver/TestReplicationSink.java       |  171 +-
 .../TestReplicationSinkManager.java             |   26 +-
 .../TestReplicationSourceManager.java           |   70 +-
 .../TestSourceFSConfigurationProvider.java      |   25 +
 .../token/TestZKSecretWatcherRefreshKeys.java   |   99 +
 .../apache/hadoop/hbase/util/HFileTestUtil.java |   99 +-
 .../util/TestBoundedConcurrentLinkedQueue.java  |  160 --
 .../hadoop/hbase/zookeeper/TestZKConfig.java    |   56 -
 hbase-shaded/pom.xml                            |   28 +
 hbase-shell/src/main/ruby/hbase/admin.rb        |   26 +-
 .../src/main/ruby/hbase/replication_admin.rb    |    4 +-
 hbase-shell/src/main/ruby/hbase/table.rb        |    6 +-
 hbase-shell/src/main/ruby/shell.rb              |    1 +
 .../main/ruby/shell/commands/locate_region.rb   |   44 +
 .../apache/hadoop/hbase/client/TestShell.java   |   39 +
 hbase-shell/src/test/ruby/hbase/table_test.rb   |   16 +
 hbase-spark/src/test/resources/hbase-site.xml   |  165 --
 hbase-spark/src/test/resources/log4j.properties |   66 -
 .../hbase/thrift/generated/AlreadyExists.java   |    2 +-
 .../hbase/thrift/generated/BatchMutation.java   |    2 +-
 .../thrift/generated/ColumnDescriptor.java      |    2 +-
 .../hadoop/hbase/thrift/generated/Hbase.java    |    2 +-
 .../hadoop/hbase/thrift/generated/IOError.java  |    2 +-
 .../hbase/thrift/generated/IllegalArgument.java |    2 +-
 .../hadoop/hbase/thrift/generated/Mutation.java |    2 +-
 .../hadoop/hbase/thrift/generated/TAppend.java  |    2 +-
 .../hadoop/hbase/thrift/generated/TCell.java    |    2 +-
 .../hadoop/hbase/thrift/generated/TColumn.java  |    2 +-
 .../hbase/thrift/generated/TIncrement.java      |    2 +-
 .../hbase/thrift/generated/TRegionInfo.java     |    2 +-
 .../hbase/thrift/generated/TRowResult.java      |    2 +-
 .../hadoop/hbase/thrift/generated/TScan.java    |    2 +-
 .../thrift2/ThriftHBaseServiceHandler.java      |   15 +
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |   15 +
 .../hadoop/hbase/thrift2/generated/TAppend.java |    2 +-
 .../hbase/thrift2/generated/TAuthorization.java |    2 +-
 .../thrift2/generated/TCellVisibility.java      |    2 +-
 .../hadoop/hbase/thrift2/generated/TColumn.java |    2 +-
 .../thrift2/generated/TColumnIncrement.java     |    2 +-
 .../hbase/thrift2/generated/TColumnValue.java   |    2 +-
 .../hbase/thrift2/generated/TCompareOp.java     |   64 +
 .../hadoop/hbase/thrift2/generated/TDelete.java |    2 +-
 .../hadoop/hbase/thrift2/generated/TGet.java    |    2 +-
 .../hbase/thrift2/generated/THBaseService.java  | 1780 +++++++++++++++++-
 .../hbase/thrift2/generated/THRegionInfo.java   |    2 +-
 .../thrift2/generated/THRegionLocation.java     |    2 +-
 .../hbase/thrift2/generated/TIOError.java       |    2 +-
 .../thrift2/generated/TIllegalArgument.java     |    2 +-
 .../hbase/thrift2/generated/TIncrement.java     |    2 +-
 .../hadoop/hbase/thrift2/generated/TPut.java    |    2 +-
 .../hadoop/hbase/thrift2/generated/TResult.java |    2 +-
 .../hbase/thrift2/generated/TRowMutations.java  |    2 +-
 .../hadoop/hbase/thrift2/generated/TScan.java   |    2 +-
 .../hbase/thrift2/generated/TServerName.java    |    2 +-
 .../hbase/thrift2/generated/TTimeRange.java     |    2 +-
 .../apache/hadoop/hbase/thrift2/hbase.thrift    |   45 +
 .../thrift2/TestThriftHBaseServiceHandler.java  |  113 +-
 pom.xml                                         |   30 +-
 244 files changed, 10534 insertions(+), 2567 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/254af5a3/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
----------------------------------------------------------------------


Mime
View raw message