hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [30/30] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Tue, 30 Jun 2015 18:52:47 GMT
Merge branch 'trunk' into HADOOP-12111


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/084becdd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/084becdd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/084becdd

Branch: refs/heads/HADOOP-12111
Commit: 084becdd7293618cd774e4e0891acb58bc8f8133
Parents: 1b80406 fe6c1bd
Author: Allen Wittenauer <aw@apache.org>
Authored: Tue Jun 30 11:51:13 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Tue Jun 30 11:51:13 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 +++++------
 .../apache/hadoop/ha/ZKFailoverController.java  |  61 +-
 .../hadoop/metrics2/impl/MetricsSystemImpl.java |   2 +-
 .../org/apache/hadoop/ha/MiniZKFCCluster.java   |  93 ++-
 .../hadoop/ha/TestZKFailoverController.java     |  32 +
 .../http/TestAuthenticationSessionCookie.java   | 187 ++++++
 .../apache/hadoop/http/TestHttpCookieFlag.java  |   2 +-
 hadoop-hdfs-project/hadoop-hdfs-client/pom.xml  |  10 +
 .../org/apache/hadoop/hdfs/DFSUtilClient.java   |   7 +-
 .../hdfs/protocol/BlockStoragePolicy.java       |  12 +-
 .../hadoop/hdfs/protocol/CachePoolInfo.java     |   3 -
 .../hadoop/hdfs/protocol/ClientProtocol.java    |   3 +-
 .../org/apache/hadoop/hdfs/web/TokenAspect.java |  16 +-
 .../hadoop/hdfs/web/URLConnectionFactory.java   |  13 +-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |  27 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  30 +
 .../bkjournal/TestBookKeeperHACheckpoints.java  |   7 +-
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 +
 .../java/org/apache/hadoop/hdfs/HAUtil.java     |  36 +-
 .../token/block/BlockTokenSecretManager.java    |  40 +-
 .../hdfs/server/blockmanagement/BlockInfo.java  |  12 +-
 .../blockmanagement/BlockInfoContiguous.java    |   2 +-
 .../BlockInfoUnderConstructionContiguous.java   |   2 +-
 .../server/blockmanagement/BlockManager.java    | 626 ++++++++++---------
 .../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/CheckpointConf.java    |  14 +-
 .../hdfs/server/namenode/FSNamesystem.java      |  27 +-
 .../hdfs/server/namenode/ImageServlet.java      |  88 ++-
 .../server/namenode/NameNodeHttpServer.java     |   7 +-
 .../hdfs/server/namenode/NameNodeMXBean.java    |   5 +-
 .../hdfs/server/namenode/NamenodeFsck.java      |   2 +-
 .../hadoop/hdfs/server/namenode/Namesystem.java |  18 +-
 .../hdfs/server/namenode/TransferFsImage.java   |  47 +-
 .../server/namenode/ha/BootstrapStandby.java    |  94 +--
 .../hdfs/server/namenode/ha/EditLogTailer.java  | 162 ++++-
 .../server/namenode/ha/RemoteNameNodeInfo.java  | 133 ++++
 .../server/namenode/ha/StandbyCheckpointer.java | 182 ++++--
 .../hdfs/tools/DFSZKFailoverController.java     |  13 +
 .../offlineImageViewer/FSImageHandler.java      |  57 +-
 .../tools/offlineImageViewer/FSImageLoader.java |  75 ++-
 .../src/main/native/fuse-dfs/fuse_impls_open.c  |   4 -
 .../src/main/resources/hdfs-default.xml         |  20 +
 .../src/site/markdown/HdfsImageViewer.md        |   2 +
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |  25 +
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java  | 464 +++++++++-----
 .../apache/hadoop/hdfs/MiniDFSNNTopology.java   |  18 +-
 .../hadoop/hdfs/TestDFSUpgradeFromImage.java    |   6 +-
 .../apache/hadoop/hdfs/TestRollingUpgrade.java  | 170 +++--
 .../hadoop/hdfs/qjournal/MiniQJMHACluster.java  |  94 +--
 .../security/token/block/TestBlockToken.java    |  10 +-
 .../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 +
 .../hdfs/server/namenode/TestBackupNode.java    |   2 +-
 .../server/namenode/TestCacheDirectives.java    |  25 +
 .../hdfs/server/namenode/TestCheckpoint.java    |   3 +-
 .../server/namenode/TestNameNodeMXBean.java     |   5 +-
 .../server/namenode/ha/HAStressTestHarness.java |  46 +-
 .../hdfs/server/namenode/ha/HATestUtil.java     |  60 +-
 .../namenode/ha/TestBootstrapStandby.java       | 176 +++---
 .../ha/TestBootstrapStandbyWithQJM.java         |  47 +-
 .../ha/TestDNFencingWithReplication.java        |   1 +
 .../server/namenode/ha/TestEditLogTailer.java   |  12 +-
 .../ha/TestFailoverWithBlockTokensEnabled.java  |  55 +-
 .../server/namenode/ha/TestHAConfiguration.java |  49 +-
 .../namenode/ha/TestPipelinesFailover.java      | 110 +++-
 .../namenode/ha/TestRemoteNameNodeInfo.java     |  61 ++
 .../namenode/ha/TestSeveralNameNodes.java       | 179 ++++++
 .../namenode/ha/TestStandbyCheckpoints.java     | 106 ++--
 .../TestOfflineImageViewerForXAttr.java         | 262 ++++++++
 .../hadoop/test/MiniDFSClusterManager.java      |   4 +
 .../src/test/resources/hadoop-0.23-reserved.tgz | Bin 4558 -> 5590 bytes
 .../src/test/resources/hadoop-1-reserved.tgz    | Bin 2572 -> 3348 bytes
 .../src/test/resources/hadoop-2-reserved.tgz    | Bin 2838 -> 3465 bytes
 .../src/test/resources/hadoop-22-dfs-dir.tgz    | Bin 318180 -> 413239 bytes
 .../src/test/resources/hadoop1-bbw.tgz          | Bin 40234 -> 43294 bytes
 .../src/test/resources/log4j.properties         |   2 +-
 hadoop-mapreduce-project/CHANGES.txt            |  10 +
 .../hadoop/mapreduce/task/reduce/Fetcher.java   |   1 +
 .../task/reduce/IFileWrappedMapOutput.java      |  10 +-
 .../mapreduce/task/reduce/LocalFetcher.java     |  15 +-
 .../mapreduce/v2/hs/server/HSAdminServer.java   |  43 +-
 .../v2/hs/server/TestHSAdminServer.java         |  55 ++
 .../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                 |  23 +
 .../hadoop/yarn/conf/YarnConfiguration.java     |  10 +
 .../impl/pb/SerializedExceptionPBImpl.java      |  26 +-
 .../src/main/resources/yarn-default.xml         |  12 +
 .../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 +-
 .../localizer/ResourceLocalizationService.java  |   2 +-
 .../logaggregation/AppLogAggregatorImpl.java    |   4 +-
 .../nodemanager/webapp/ContainerLogsUtils.java  |   2 +-
 .../TestLogAggregationService.java              |  54 +-
 .../webapp/TestContainerLogsPage.java           |  22 +-
 .../resourcemanager/ResourceTrackerService.java |  23 +-
 .../amlauncher/ApplicationMasterLauncher.java   |  30 +-
 .../scheduler/fair/FairScheduler.java           |  11 +-
 .../server/resourcemanager/TestRMRestart.java   |   8 +-
 129 files changed, 4335 insertions(+), 1500 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/084becdd/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message