You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2017/07/19 22:35:41 UTC
[49/50] [abbrv] hadoop git commit: Merge branch 'HDFS-7240' of
https://git-wip-us.apache.org/repos/asf/hadoop into HDFS-7240
Merge branch 'HDFS-7240' of https://git-wip-us.apache.org/repos/asf/hadoop into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84e11c7c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84e11c7c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84e11c7c
Branch: refs/heads/HDFS-7240
Commit: 84e11c7c01a928e9e101d3ca0a7be0547479ca12
Parents: 9a4246c a715f60
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Wed Jul 19 14:47:05 2017 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Wed Jul 19 14:47:05 2017 -0700
----------------------------------------------------------------------
.../hadoop/util/concurrent/HadoopExecutors.java | 41 ++
.../org/apache/hadoop/scm/ScmConfigKeys.java | 23 +
.../server/datanode/ObjectStoreHandler.java | 3 +-
.../checker/StorageLocationChecker.java | 8 +-
.../org/apache/hadoop/ozone/OzoneBucket.java | 117 ++++
.../org/apache/hadoop/ozone/OzoneClient.java | 608 ++++++++++++-------
.../apache/hadoop/ozone/OzoneClientImpl.java | 519 ++++++++++++++++
.../apache/hadoop/ozone/OzoneConfigKeys.java | 9 +
.../apache/hadoop/ozone/OzoneConfiguration.java | 7 +
.../java/org/apache/hadoop/ozone/OzoneKey.java | 120 ++++
.../org/apache/hadoop/ozone/OzoneVolume.java | 107 ++++
.../common/helpers/ContainerUtils.java | 16 +-
.../container/common/helpers/KeyUtils.java | 20 +-
.../common/impl/ContainerManagerImpl.java | 6 +-
.../container/common/impl/KeyManagerImpl.java | 57 +-
.../container/common/interfaces/KeyManager.java | 13 +-
.../container/common/utils/ContainerCache.java | 14 +-
.../hadoop/ozone/io/OzoneInputStream.java | 52 ++
.../hadoop/ozone/io/OzoneOutputStream.java | 62 ++
.../apache/hadoop/ozone/io/package-info.java | 23 +
.../apache/hadoop/ozone/ksm/BucketManager.java | 2 +-
.../org/apache/hadoop/ozone/ksm/KeyManager.java | 1 +
.../hadoop/ozone/ksm/MetadataManager.java | 32 +-
.../hadoop/ozone/ksm/MetadataManagerImpl.java | 181 +++---
.../apache/hadoop/ozone/ksm/VolumeManager.java | 3 +-
.../hadoop/ozone/ksm/VolumeManagerImpl.java | 50 +-
.../ozone/scm/StorageContainerManager.java | 10 +-
.../ozone/scm/block/BlockManagerImpl.java | 67 +-
.../org/apache/hadoop/ozone/scm/cli/SQLCLI.java | 112 ++--
.../ozone/scm/container/ContainerMapping.java | 19 +-
.../ContainerReplicationManager.java | 306 ++++++++++
.../container/replication/InProgressPool.java | 302 +++++++++
.../scm/container/replication/PeriodicPool.java | 119 ++++
.../scm/container/replication/package-info.java | 23 +
.../ozone/scm/exceptions/SCMException.java | 3 +-
.../hadoop/ozone/scm/node/CommandQueue.java | 126 +++-
.../hadoop/ozone/scm/node/NodeManager.java | 10 +-
.../hadoop/ozone/scm/node/NodePoolManager.java | 5 +-
.../hadoop/ozone/scm/node/SCMNodeManager.java | 51 +-
.../ozone/scm/node/SCMNodePoolManager.java | 53 +-
.../hadoop/ozone/web/client/OzoneBucket.java | 22 +-
.../ozone/web/client/OzoneRestClient.java | 17 +-
.../hadoop/ozone/web/client/OzoneVolume.java | 6 +-
.../web/handlers/BucketProcessTemplate.java | 20 +-
.../ozone/web/handlers/KeyProcessTemplate.java | 7 +
.../web/handlers/VolumeProcessTemplate.java | 5 +-
.../web/localstorage/OzoneMetadataManager.java | 133 ++--
.../apache/hadoop/ozone/web/ozShell/Shell.java | 2 +
.../web/ozShell/bucket/ListBucketHandler.java | 2 +
.../web/ozShell/volume/ListVolumeHandler.java | 13 +-
.../web/ozShell/volume/UpdateVolumeHandler.java | 4 +-
.../hadoop/ozone/web/utils/OzoneUtils.java | 24 +
.../org/apache/hadoop/utils/BatchOperation.java | 90 +++
.../org/apache/hadoop/utils/EntryConsumer.java | 38 ++
.../apache/hadoop/utils/LevelDBKeyFilters.java | 65 --
.../org/apache/hadoop/utils/LevelDBStore.java | 182 +++---
.../apache/hadoop/utils/MetadataKeyFilters.java | 65 ++
.../org/apache/hadoop/utils/MetadataStore.java | 152 +++++
.../hadoop/utils/MetadataStoreBuilder.java | 96 +++
.../StorageContainerDatanodeProtocol.proto | 5 +-
.../src/main/resources/ozone-default.xml | 42 ++
.../hadoop-hdfs/src/site/markdown/OzoneRest.md | 14 +-
.../apache/hadoop/ozone/MiniOzoneCluster.java | 12 +
.../apache/hadoop/ozone/RatisTestHelper.java | 80 ++-
.../apache/hadoop/ozone/TestLevelDBStore.java | 165 -----
.../apache/hadoop/ozone/TestMetadataStore.java | 296 +++++++++
.../apache/hadoop/ozone/TestOzoneClient.java | 190 ------
.../hadoop/ozone/TestOzoneClientImpl.java | 214 +++++++
.../ReplicationDatanodeStateManager.java | 92 +++
.../TestUtils/ReplicationNodeManagerMock.java | 315 ++++++++++
.../ReplicationNodePoolManagerMock.java | 132 ++++
.../ozone/container/TestUtils/package-info.java | 18 +
.../ozone/container/common/SCMTestUtils.java | 8 +-
.../ozone/container/common/TestEndPoint.java | 12 +-
.../common/impl/TestContainerPersistence.java | 55 +-
.../TestContainerReplicationManager.java | 260 ++++++++
.../container/replication/package-info.java | 18 +
.../hadoop/ozone/ksm/TestKeySpaceManager.java | 15 +-
.../hadoop/ozone/ozShell/TestOzoneShell.java | 440 +++++++++++++-
.../apache/hadoop/ozone/scm/TestSCMMXBean.java | 5 +-
.../ozone/scm/container/MockNodeManager.java | 11 +
.../hadoop/ozone/web/client/TestBuckets.java | 32 +-
.../ozone/web/client/TestBucketsRatis.java | 75 +++
.../hadoop/ozone/web/client/TestKeys.java | 92 ++-
.../hadoop/ozone/web/client/TestKeysRatis.java | 88 +++
.../hadoop/ozone/web/client/TestVolume.java | 76 ++-
.../ozone/web/client/TestVolumeRatis.java | 99 +++
.../src/test/resources/log4j.properties | 2 +-
88 files changed, 5839 insertions(+), 1267 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org