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 na...@apache.org on 2017/12/26 22:44:09 UTC
[13/50] [abbrv] hadoop git commit: Merge branch 'HDFS-9806' into trunk
Merge branch 'HDFS-9806' into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc7ec80d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc7ec80d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc7ec80d
Branch: refs/heads/yarn-3409
Commit: fc7ec80d85a751b2b2b261a2b97ec38c7b58f1df
Parents: 44825f0 4b3a785
Author: Chris Douglas <cd...@apache.org>
Authored: Fri Dec 15 18:06:24 2017 -0800
Committer: Chris Douglas <cd...@apache.org>
Committed: Fri Dec 15 18:06:24 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/fs/StorageType.java | 3 +-
.../org/apache/hadoop/fs/shell/TestCount.java | 3 +-
.../hadoop/hdfs/protocol/HdfsConstants.java | 3 +
.../hadoop/hdfs/protocol/LocatedBlock.java | 103 ++-
.../hdfs/protocol/ProvidedStorageLocation.java | 89 ++
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 36 +
.../src/main/proto/hdfs.proto | 15 +
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 7 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 29 +
.../hdfs/protocolPB/AliasMapProtocolPB.java | 37 +
.../AliasMapProtocolServerSideTranslatorPB.java | 134 +++
...yAliasMapProtocolClientSideTranslatorPB.java | 174 ++++
.../apache/hadoop/hdfs/protocolPB/PBHelper.java | 28 +
.../hdfs/server/aliasmap/InMemoryAliasMap.java | 222 +++++
.../aliasmap/InMemoryAliasMapProtocol.java | 103 +++
.../aliasmap/InMemoryLevelDBAliasMapServer.java | 153 +++
.../hdfs/server/blockmanagement/BlockInfo.java | 17 +-
.../server/blockmanagement/BlockManager.java | 149 ++-
.../BlockStoragePolicySuite.java | 6 +
.../blockmanagement/DatanodeDescriptor.java | 44 +-
.../server/blockmanagement/DatanodeManager.java | 2 +
.../blockmanagement/DatanodeStatistics.java | 3 +
.../server/blockmanagement/DatanodeStats.java | 4 +-
.../blockmanagement/DatanodeStorageInfo.java | 15 +-
.../blockmanagement/HeartbeatManager.java | 9 +-
.../blockmanagement/LocatedBlockBuilder.java | 109 +++
.../blockmanagement/ProvidedStorageMap.java | 540 +++++++++++
.../blockmanagement/StorageTypeStats.java | 33 +-
.../hadoop/hdfs/server/common/BlockAlias.java | 33 +
.../hadoop/hdfs/server/common/FileRegion.java | 85 ++
.../hadoop/hdfs/server/common/Storage.java | 71 +-
.../hadoop/hdfs/server/common/StorageInfo.java | 6 +
.../common/blockaliasmap/BlockAliasMap.java | 113 +++
.../impl/InMemoryLevelDBAliasMapClient.java | 178 ++++
.../impl/LevelDBFileRegionAliasMap.java | 274 ++++++
.../impl/TextFileRegionAliasMap.java | 490 ++++++++++
.../common/blockaliasmap/package-info.java | 27 +
.../server/datanode/BlockPoolSliceStorage.java | 20 +-
.../hdfs/server/datanode/DataStorage.java | 44 +-
.../hdfs/server/datanode/DirectoryScanner.java | 26 +-
.../datanode/FinalizedProvidedReplica.java | 122 +++
.../hdfs/server/datanode/ProvidedReplica.java | 350 +++++++
.../hdfs/server/datanode/ReplicaBuilder.java | 141 ++-
.../hdfs/server/datanode/ReplicaInfo.java | 20 +-
.../hdfs/server/datanode/StorageLocation.java | 54 +-
.../server/datanode/fsdataset/FsDatasetSpi.java | 4 +-
.../server/datanode/fsdataset/FsVolumeSpi.java | 38 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 65 +-
.../datanode/fsdataset/impl/FsDatasetUtil.java | 25 +-
.../datanode/fsdataset/impl/FsVolumeImpl.java | 19 +-
.../fsdataset/impl/FsVolumeImplBuilder.java | 6 +
.../fsdataset/impl/ProvidedVolumeImpl.java | 718 ++++++++++++++
.../federation/metrics/FederationMBean.java | 6 +
.../federation/metrics/FederationMetrics.java | 5 +
.../federation/metrics/NamenodeBeanMetrics.java | 10 +
.../resolver/MembershipNamenodeResolver.java | 1 +
.../resolver/NamenodeStatusReport.java | 12 +-
.../router/NamenodeHeartbeatService.java | 3 +-
.../store/records/MembershipStats.java | 4 +
.../records/impl/pb/MembershipStatsPBImpl.java | 10 +
.../apache/hadoop/hdfs/server/mover/Mover.java | 2 +-
.../server/namenode/FSImageCompression.java | 2 +-
.../hdfs/server/namenode/FSNamesystem.java | 12 +
.../hadoop/hdfs/server/namenode/NNStorage.java | 10 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 21 +
.../hdfs/server/namenode/NameNodeMXBean.java | 10 +-
.../namenode/metrics/FSNamesystemMBean.java | 7 +-
.../hdfs/server/protocol/NamespaceInfo.java | 8 +
.../src/main/proto/AliasMapProtocol.proto | 68 ++
.../src/main/proto/FederationProtocol.proto | 1 +
.../src/main/resources/hdfs-default.xml | 119 +++
.../src/main/webapps/hdfs/dfshealth.html | 1 +
.../src/site/markdown/HdfsProvidedStorage.md | 247 +++++
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 30 +-
.../hadoop/hdfs/TestBlockStoragePolicy.java | 6 +
.../org/apache/hadoop/hdfs/TestDFSRollback.java | 6 +-
.../hadoop/hdfs/TestDFSStartupVersions.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 4 +-
.../apache/hadoop/hdfs/UpgradeUtilities.java | 16 +-
.../server/aliasmap/ITestInMemoryAliasMap.java | 129 +++
.../server/aliasmap/TestInMemoryAliasMap.java | 45 +
.../blockmanagement/TestDatanodeManager.java | 66 +-
.../blockmanagement/TestProvidedStorageMap.java | 120 +++
.../impl/TestInMemoryLevelDBAliasMapClient.java | 344 +++++++
.../impl/TestLevelDBFileRegionAliasMap.java | 117 +++
.../impl/TestLevelDbMockAliasMapClient.java | 121 +++
.../impl/TestTextBlockAliasMap.java | 200 ++++
.../server/datanode/SimulatedFSDataset.java | 6 +-
.../datanode/TestProvidedReplicaImpl.java | 162 ++++
.../extdataset/ExternalDatasetImpl.java | 5 +-
.../fsdataset/impl/TestFsDatasetImpl.java | 17 +-
.../fsdataset/impl/TestProvidedImpl.java | 649 +++++++++++++
.../metrics/TestFederationMetrics.java | 2 +
.../hdfs/server/namenode/TestClusterId.java | 5 +-
hadoop-project/pom.xml | 8 +-
.../dev-support/findbugs-exclude.xml | 28 +
hadoop-tools/hadoop-fs2img/pom.xml | 93 ++
.../hdfs/server/namenode/BlockResolver.java | 99 ++
.../hadoop/hdfs/server/namenode/FSTreeWalk.java | 109 +++
.../hdfs/server/namenode/FileSystemImage.java | 152 +++
.../FixedBlockMultiReplicaResolver.java | 48 +
.../server/namenode/FixedBlockResolver.java | 98 ++
.../hdfs/server/namenode/FsUGIResolver.java | 63 ++
.../hdfs/server/namenode/ImageWriter.java | 628 +++++++++++++
.../hdfs/server/namenode/NullBlockAliasMap.java | 97 ++
.../hdfs/server/namenode/SingleUGIResolver.java | 94 ++
.../hadoop/hdfs/server/namenode/TreePath.java | 187 ++++
.../hadoop/hdfs/server/namenode/TreeWalk.java | 108 +++
.../hdfs/server/namenode/UGIResolver.java | 135 +++
.../hdfs/server/namenode/package-info.java | 23 +
.../namenode/ITestProvidedImplementation.java | 927 +++++++++++++++++++
.../hdfs/server/namenode/RandomTreeWalk.java | 184 ++++
.../server/namenode/TestFixedBlockResolver.java | 121 +++
.../server/namenode/TestRandomTreeWalk.java | 130 +++
.../server/namenode/TestSingleUGIResolver.java | 148 +++
.../src/test/resources/log4j.properties | 24 +
hadoop-tools/hadoop-tools-dist/pom.xml | 6 +
hadoop-tools/pom.xml | 1 +
118 files changed, 10918 insertions(+), 203 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org