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/3be3835b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3be3835b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3be3835b Branch: refs/heads/HDFS-7240 Commit: 3be3835beb21d6402c2bf40d6e41544aa93ef0e7 Parents: ae655ea aa07dea Author: Arpit Agarwal <[email protected]> Authored: Fri Jun 26 14:38:23 2015 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Fri Jun 26 14:38:23 2015 -0700 ---------------------------------------------------------------------- .../server/AuthenticationFilter.java | 28 +- hadoop-common-project/hadoop-common/CHANGES.txt | 8 + .../hadoop-common/HadoopCommon.cmake | 207 +++++++ .../hadoop-common/HadoopJNI.cmake | 97 +++ .../hadoop-common/src/CMakeLists.txt | 366 +++++------ .../hadoop/metrics2/impl/MetricsSystemImpl.java | 2 +- .../http/TestAuthenticationSessionCookie.java | 187 ++++++ .../apache/hadoop/http/TestHttpCookieFlag.java | 2 +- .../hadoop/hdfs/protocol/ClientProtocol.java | 3 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 22 + .../hdfs/server/blockmanagement/BlockInfo.java | 12 +- .../blockmanagement/BlockInfoContiguous.java | 2 +- .../BlockInfoUnderConstructionContiguous.java | 2 +- .../server/blockmanagement/BlockManager.java | 605 ++++++++++--------- .../blockmanagement/DatanodeStorageInfo.java | 15 +- .../hadoop/hdfs/server/common/Storage.java | 24 +- .../hdfs/server/datanode/BPServiceActor.java | 6 +- .../hadoop/hdfs/server/datanode/DataNode.java | 17 +- .../hdfs/server/datanode/DataStorage.java | 45 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 5 +- .../hdfs/server/namenode/CacheManager.java | 24 +- .../hdfs/server/namenode/FSNamesystem.java | 27 +- .../hdfs/server/namenode/NameNodeMXBean.java | 5 +- .../hdfs/server/namenode/NamenodeFsck.java | 2 +- .../hadoop/hdfs/server/namenode/Namesystem.java | 18 +- .../offlineImageViewer/FSImageHandler.java | 57 +- .../tools/offlineImageViewer/FSImageLoader.java | 75 ++- .../src/main/native/fuse-dfs/fuse_impls_open.c | 4 - .../src/site/markdown/HdfsImageViewer.md | 2 + .../org/apache/hadoop/hdfs/DFSTestUtil.java | 25 + .../apache/hadoop/hdfs/TestRollingUpgrade.java | 63 +- .../server/blockmanagement/TestBlockInfo.java | 2 +- .../blockmanagement/TestBlockManager.java | 4 +- .../server/blockmanagement/TestNodeCount.java | 2 +- .../TestOverReplicatedBlocks.java | 4 +- .../blockmanagement/TestReplicationPolicy.java | 2 +- .../hdfs/server/datanode/DataNodeTestUtils.java | 11 + .../fsdataset/impl/TestRbwSpaceReservation.java | 28 + .../server/namenode/TestCacheDirectives.java | 25 + .../server/namenode/TestNameNodeMXBean.java | 5 +- .../TestOfflineImageViewerForXAttr.java | 262 ++++++++ hadoop-mapreduce-project/CHANGES.txt | 3 + .../hadoop/mapred/TestLocalJobSubmission.java | 4 +- .../apache/hadoop/tools/DistCpConstants.java | 2 +- .../apache/hadoop/tools/DistCpOptionSwitch.java | 5 +- .../org/apache/hadoop/tools/DistCpOptions.java | 6 +- .../org/apache/hadoop/tools/OptionsParser.java | 2 +- .../apache/hadoop/tools/mapred/CopyMapper.java | 17 +- .../tools/mapred/RetriableFileCopyCommand.java | 2 +- .../hadoop/tools/util/ThrottledInputStream.java | 6 +- .../apache/hadoop/tools/TestOptionsParser.java | 16 +- hadoop-yarn-project/CHANGES.txt | 15 +- .../impl/pb/SerializedExceptionPBImpl.java | 26 +- .../impl/pb/TestSerializedExceptionPBImpl.java | 11 + .../server/timeline/TimelineDataManager.java | 123 ++++ .../timeline/TimelineDataManagerMetrics.java | 174 ++++++ .../TestApplicationHistoryClientService.java | 1 + ...pplicationHistoryManagerOnTimelineStore.java | 1 + .../webapp/TestAHSWebServices.java | 1 + .../timeline/TestTimelineDataManager.java | 1 + .../server/utils/YarnServerBuilderUtils.java | 11 +- .../nodemanager/LocalDirsHandlerService.java | 24 + .../launcher/RecoveredContainerLaunch.java | 3 +- .../logaggregation/AppLogAggregatorImpl.java | 4 +- .../nodemanager/webapp/ContainerLogsUtils.java | 2 +- .../TestLogAggregationService.java | 54 +- .../webapp/TestContainerLogsPage.java | 22 +- .../resourcemanager/ResourceTrackerService.java | 23 +- 68 files changed, 2171 insertions(+), 690 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3be3835b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3be3835b/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/3be3835b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java index 4895c84,65b83e1..9430663 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java @@@ -17,8 -17,14 +17,9 @@@ */ package org.apache.hadoop.hdfs.server.blockmanagement; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import com.google.common.annotations.VisibleForTesting; - import org.apache.hadoop.fs.StorageType; + import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage; import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage.State; http://git-wip-us.apache.org/repos/asf/hadoop/blob/3be3835b/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/3be3835b/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/3be3835b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ----------------------------------------------------------------------
