Merge remote-tracking branch 'apache-commit/trunk' 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/dd784e97 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd784e97 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd784e97 Branch: refs/heads/HDFS-7240 Commit: dd784e975f0068698c7a615abf42ecd443137745 Parents: 197b8fb c7d022b Author: Arpit Agarwal <[email protected]> Authored: Sat Jun 20 14:14:35 2015 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Sat Jun 20 14:14:35 2015 -0700 ---------------------------------------------------------------------- dev-support/determine-flaky-tests-hadoop.py | 57 +- hadoop-common-project/hadoop-common/CHANGES.txt | 22 + .../apache/hadoop/conf/ReconfigurableBase.java | 14 +- .../java/org/apache/hadoop/fs/StorageType.java | 7 +- .../hadoop/fs/permission/FsPermission.java | 7 +- .../java/org/apache/hadoop/io/SequenceFile.java | 85 +- .../hadoop/security/LdapGroupsMapping.java | 29 +- .../alias/AbstractJavaKeyStoreProvider.java | 15 +- .../DelegationTokenAuthenticationFilter.java | 16 +- .../src/main/resources/core-default.xml | 18 + .../apache/hadoop/conf/TestReconfiguration.java | 12 +- .../org/apache/hadoop/fs/shell/TestCount.java | 4 +- .../hadoop/io/TestSequenceFileAppend.java | 311 ++++ .../TestLdapGroupsMappingWithPosixGroup.java | 25 +- .../hdfs/client/HdfsClientConfigKeys.java | 1 + .../hadoop/hdfs/protocol/ClientProtocol.java | 1459 ++++++++++++++++++ .../hdfs/server/namenode/SafeModeException.java | 38 + .../http/server/HttpFSAuthenticationFilter.java | 5 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 72 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 7 +- .../org/apache/hadoop/hdfs/DFSOutputStream.java | 68 +- .../org/apache/hadoop/hdfs/DataStreamer.java | 7 +- .../hdfs/protocol/ClientDatanodeProtocol.java | 5 + .../hadoop/hdfs/protocol/ClientProtocol.java | 1459 ------------------ ...tDatanodeProtocolServerSideTranslatorPB.java | 19 + .../ClientDatanodeProtocolTranslatorPB.java | 19 +- .../server/blockmanagement/BlockManager.java | 54 +- .../BlockReportLeaseManager.java | 1 - .../hdfs/server/blockmanagement/BlocksMap.java | 6 +- .../blockmanagement/DecommissionManager.java | 42 +- .../PendingReplicationBlocks.java | 51 +- .../blockmanagement/UnderReplicatedBlocks.java | 57 +- .../hdfs/server/datanode/BPServiceActor.java | 1 - .../hdfs/server/datanode/BlockReceiver.java | 126 +- .../hadoop/hdfs/server/datanode/DataNode.java | 26 +- .../hdfs/server/datanode/StorageLocation.java | 4 +- .../datanode/fsdataset/impl/FsDatasetCache.java | 7 + .../datanode/fsdataset/impl/FsDatasetImpl.java | 98 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 7 +- .../apache/hadoop/hdfs/server/mover/Mover.java | 95 +- .../hdfs/server/namenode/FSDirAttrOp.java | 11 +- .../server/namenode/FSDirStatAndListingOp.java | 93 +- .../hdfs/server/namenode/FSDirectory.java | 20 + .../hdfs/server/namenode/FSNamesystem.java | 203 +-- .../hadoop/hdfs/server/namenode/INode.java | 12 +- .../hadoop/hdfs/server/namenode/INodeFile.java | 4 +- .../hdfs/server/namenode/NamenodeFsck.java | 63 +- .../hadoop/hdfs/server/namenode/SafeMode.java | 4 +- .../hdfs/server/namenode/SafeModeException.java | 39 - .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 59 +- .../offlineImageViewer/PBImageXmlWriter.java | 20 +- .../src/main/proto/ClientDatanodeProtocol.proto | 12 + .../src/main/resources/hdfs-default.xml | 2 +- .../site/markdown/CentralizedCacheManagement.md | 2 + .../src/site/markdown/MemoryStorage.md | 130 ++ .../hadoop-hdfs/src/site/markdown/WebHDFS.md | 12 +- .../site/resources/images/LazyPersistWrites.png | Bin 0 -> 107161 bytes .../hadoop/hdfs/TestBlockStoragePolicy.java | 75 +- .../apache/hadoop/hdfs/TestDecommission.java | 26 - .../apache/hadoop/hdfs/TestLeaseRecovery.java | 46 + .../org/apache/hadoop/hdfs/TestSafeMode.java | 4 +- .../hdfs/server/balancer/TestBalancer.java | 1 - .../blockmanagement/BlockManagerTestUtil.java | 5 +- .../blockmanagement/TestBlockManager.java | 8 +- .../server/blockmanagement/TestNodeCount.java | 3 +- .../TestOverReplicatedBlocks.java | 5 +- .../blockmanagement/TestPendingReplication.java | 27 +- .../TestRBWBlockInvalidation.java | 4 +- .../blockmanagement/TestReplicationPolicy.java | 70 +- .../TestUnderReplicatedBlockQueues.java | 16 +- .../datanode/TestReadOnlySharedStorage.java | 11 +- .../fsdataset/impl/LazyPersistTestCase.java | 42 +- .../impl/TestLazyPersistLockedMemory.java | 25 +- .../impl/TestLazyPersistReplicaPlacement.java | 36 +- .../datanode/fsdataset/impl/TestLazyWriter.java | 62 +- .../fsdataset/impl/TestRbwSpaceReservation.java | 45 + .../fsdataset/impl/TestScrLazyPersistFiles.java | 193 +-- .../hadoop/hdfs/server/mover/TestMover.java | 29 + .../hdfs/server/mover/TestStorageMover.java | 18 +- .../hadoop/hdfs/server/namenode/TestFsck.java | 16 +- .../namenode/TestProcessCorruptBlocks.java | 5 +- .../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 117 +- .../TestOfflineImageViewerForAcl.java | 24 + hadoop-mapreduce-project/CHANGES.txt | 21 + .../hadoop/mapreduce/v2/app/MRAppMaster.java | 14 +- .../mapreduce/v2/app/webapp/AttemptsPage.java | 8 + .../mapreduce/v2/app/webapp/TaskPage.java | 93 +- .../mapreduce/v2/app/webapp/TestBlocks.java | 92 +- .../apache/hadoop/mapred/FileInputFormat.java | 2 +- .../mapreduce/lib/input/FileInputFormat.java | 3 +- .../mapreduce/v2/hs/webapp/HsAttemptsPage.java | 7 + .../mapreduce/v2/hs/webapp/HsController.java | 28 +- .../mapreduce/v2/hs/webapp/HsCountersPage.java | 8 +- .../mapreduce/v2/hs/webapp/HsLogsPage.java | 11 +- .../v2/hs/webapp/HsSingleCounterPage.java | 8 +- .../mapreduce/v2/hs/webapp/HsTaskPage.java | 11 +- .../hadoop/mapreduce/v2/hs/webapp/HsView.java | 13 + .../mapreduce/v2/hs/webapp/TestBlocks.java | 2 +- .../java/org/apache/hadoop/hdfs/NNBench.java | 15 +- .../mapred/pipes/TestPipeApplication.java | 5 +- hadoop-project/src/site/site.xml | 1 + hadoop-yarn-project/CHANGES.txt | 24 + .../hadoop/yarn/conf/YarnConfiguration.java | 4 +- .../org/apache/hadoop/yarn/util/RMHAUtils.java | 33 +- .../util/WindowsResourceCalculatorPlugin.java | 2 +- .../resources/webapps/static/yarn.dt.plugins.js | 16 +- .../server/resourcemanager/AdminService.java | 19 +- .../resourcemanager/rmnode/RMNodeImpl.java | 8 +- .../scheduler/capacity/LeafQueue.java | 17 +- .../resourcemanager/TestRMAdminService.java | 49 +- .../resourcetracker/TestNMReconnect.java | 67 +- .../server/webproxy/WebAppProxyServlet.java | 5 +- .../server/webproxy/TestWebAppProxyServlet.java | 57 + .../amfilter/TestAmFilterInitializer.java | 47 + .../src/site/markdown/ResourceManagerHA.md | 16 +- 115 files changed, 4134 insertions(+), 2527 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd784e97/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ----------------------------------------------------------------------
