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 vi...@apache.org on 2014/11/12 04:47:47 UTC
[25/25] hadoop git commit: Merge remote-tracking branch
'origin/trunk' into HDFS-EC
Merge remote-tracking branch 'origin/trunk' into HDFS-EC
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95b3ebaa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95b3ebaa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95b3ebaa
Branch: refs/heads/HDFS-EC
Commit: 95b3ebaa1bb8d4a8da4ec4daf2ac3287d0e43b04
Parents: 3a1b3f8 46f6f9d
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Nov 12 09:15:22 2014 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Nov 12 09:15:22 2014 +0530
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 14 +-
.../src/main/docs/releasenotes.html | 3525 ++++++++++++++++++
.../java/org/apache/hadoop/net/NetUtils.java | 8 +
.../hadoop/security/UserGroupInformation.java | 38 +-
.../org/apache/hadoop/net/TestNetUtils.java | 12 +
.../hadoop/security/TestUGILoginFromKeytab.java | 91 +
.../hadoop/nfs/nfs3/Nfs3FileAttributes.java | 29 +-
.../java/org/apache/hadoop/oncrpc/RpcUtil.java | 2 +-
.../apache/hadoop/hdfs/nfs/nfs3/Nfs3Utils.java | 25 +-
.../hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 88 +-
.../apache/hadoop/hdfs/nfs/nfs3/TestWrites.java | 107 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 19 +-
.../server/blockmanagement/BlockIdManager.java | 208 ++
.../server/blockmanagement/BlockManager.java | 14 +-
.../blockmanagement/BlockPlacementPolicy.java | 1 -
.../BlockPlacementPolicyDefault.java | 1 -
.../BlockPlacementPolicyWithNodeGroup.java | 1 -
.../server/blockmanagement/DatanodeManager.java | 40 +-
.../server/blockmanagement/FSClusterStats.java | 60 +
.../SequentialBlockIdGenerator.java | 66 +
.../hadoop/hdfs/server/datanode/DataNode.java | 2 +-
.../hdfs/server/datanode/DatanodeUtil.java | 21 +
.../datanode/fsdataset/impl/FsDatasetCache.java | 4 +-
.../hdfs/server/namenode/FSClusterStats.java | 62 -
.../hdfs/server/namenode/FSEditLogLoader.java | 6 +-
.../hdfs/server/namenode/FSImageFormat.java | 22 +-
.../server/namenode/FSImageFormatProtobuf.java | 23 +-
.../hdfs/server/namenode/FSNamesystem.java | 212 +-
.../server/namenode/FSPermissionChecker.java | 1 +
.../namenode/SequentialBlockIdGenerator.java | 66 -
.../blockmanagement/TestBlockManager.java | 10 +-
.../blockmanagement/TestReplicationPolicy.java | 13 +-
.../TestReplicationPolicyConsiderLoad.java | 6 +-
.../blockmanagement/TestSequentialBlockId.java | 197 +
.../hdfs/server/namenode/FSAclBaseTest.java | 37 +-
.../server/namenode/TestNameNodeMXBean.java | 126 +-
.../namenode/TestNamenodeCapacityReport.java | 72 +-
.../hdfs/server/namenode/TestSaveNamespace.java | 11 +-
.../server/namenode/TestSequentialBlockId.java | 209 --
hadoop-mapreduce-project/CHANGES.txt | 4 +-
.../v2/app/local/LocalContainerAllocator.java | 2 +-
.../jobhistory/TestJobHistoryEventHandler.java | 2 +-
.../apache/hadoop/mapreduce/v2/app/MRApp.java | 6 +-
.../hadoop/mapreduce/v2/app/MRAppBenchmark.java | 4 +-
.../hadoop/mapreduce/v2/app/MockJobs.java | 6 +-
.../v2/app/TestCheckpointPreemptionPolicy.java | 2 +-
.../v2/app/TestKillAMPreemptionPolicy.java | 2 +-
.../mapreduce/v2/app/TestMRAppMaster.java | 2 +-
.../mapreduce/v2/app/TestStagingCleanup.java | 2 +-
.../v2/app/job/impl/TestTaskAttempt.java | 22 +-
.../v2/app/launcher/TestContainerLauncher.java | 8 +-
.../app/launcher/TestContainerLauncherImpl.java | 2 +-
.../v2/app/rm/TestRMContainerAllocator.java | 10 +-
.../mapreduce/v2/hs/webapp/TestBlocks.java | 2 +-
.../v2/TestMRJobsWithHistoryService.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 22 +-
.../hadoop/yarn/api/records/ContainerId.java | 16 +-
.../UnmanagedAMLauncher.java | 2 +-
.../hadoop/yarn/client/cli/RMAdminCLI.java | 14 +-
.../hadoop/yarn/client/ProtocolHATestBase.java | 2 +-
.../api/async/impl/TestAMRMClientAsync.java | 2 +-
.../api/async/impl/TestNMClientAsync.java | 2 +-
.../yarn/client/api/impl/TestAHSClient.java | 16 +-
.../api/impl/TestAMRMClientOnRMRestart.java | 2 +-
.../yarn/client/api/impl/TestYarnClient.java | 16 +-
.../hadoop/yarn/client/cli/TestLogsCLI.java | 6 +-
.../hadoop/yarn/client/cli/TestYarnCLI.java | 14 +-
.../org/apache/hadoop/yarn/client/RMProxy.java | 2 +
.../apache/hadoop/yarn/client/ServerProxy.java | 2 +
.../nodelabels/CommonNodeLabelsManager.java | 20 +-
.../apache/hadoop/yarn/util/ConverterUtils.java | 2 +-
.../org/apache/hadoop/yarn/util/FSDownload.java | 17 +-
.../java/org/apache/hadoop/yarn/util/Times.java | 3 +-
.../resources/webapps/static/yarn.dt.plugins.js | 27 +-
.../hadoop/yarn/TestContainerLaunchRPC.java | 2 +-
.../java/org/apache/hadoop/yarn/TestRPC.java | 2 +-
.../apache/hadoop/yarn/api/TestContainerId.java | 2 +-
.../yarn/api/TestContainerResourceDecrease.java | 2 +-
.../yarn/api/TestContainerResourceIncrease.java | 2 +-
.../TestContainerResourceIncreaseRequest.java | 2 +-
.../logaggregation/TestAggregatedLogFormat.java | 2 +-
.../logaggregation/TestAggregatedLogsBlock.java | 2 +-
.../yarn/nodelabels/NodeLabelTestBase.java | 12 +-
.../nodelabels/TestCommonNodeLabelsManager.java | 23 +
.../yarn/security/TestYARNTokenIdentifier.java | 2 +-
.../ApplicationHistoryStoreTestUtils.java | 2 +-
.../TestApplicationHistoryClientService.java | 6 +-
...pplicationHistoryManagerOnTimelineStore.java | 8 +-
.../TestFileSystemApplicationHistoryStore.java | 10 +-
.../TestMemoryApplicationHistoryStore.java | 12 +-
.../webapp/TestAHSWebApp.java | 4 +-
.../webapp/TestAHSWebServices.java | 2 +-
.../hadoop/yarn/server/utils/BuilderUtils.java | 4 +-
.../hadoop/yarn/TestYarnServerApiClasses.java | 2 +-
.../protocolrecords/TestProtocolRecords.java | 4 +-
.../TestRegisterNodeManagerRequest.java | 2 +-
.../server/nodemanager/DirectoryCollection.java | 2 -
.../yarn/server/nodemanager/TestEventFlow.java | 2 +-
.../nodemanager/TestLinuxContainerExecutor.java | 2 +-
.../nodemanager/TestNodeManagerReboot.java | 2 +-
.../nodemanager/TestNodeManagerResync.java | 2 +-
.../nodemanager/TestNodeManagerShutdown.java | 2 +-
.../nodemanager/TestNodeStatusUpdater.java | 21 +-
.../containermanager/TestAuxServices.java | 2 +-
.../containermanager/TestContainerManager.java | 2 +-
.../TestContainerManagerRecovery.java | 2 +-
.../launcher/TestContainerLaunch.java | 8 +-
.../monitor/TestContainersMonitor.java | 2 +-
.../TestNMLeveldbStateStoreService.java | 2 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 27 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 4 +-
.../resourcemanager/TestApplicationCleanup.java | 2 +-
.../resourcemanager/TestClientRMService.java | 6 +-
.../TestContainerResourceUsage.java | 4 +-
.../server/resourcemanager/TestRMRestart.java | 2 +-
.../TestResourceTrackerService.java | 8 +-
.../TestWorkPreservingRMRestart.java | 69 +-
.../ahs/TestRMApplicationHistoryWriter.java | 12 +-
.../applicationsmanager/MockAsm.java | 2 +-
.../applicationsmanager/TestAMRestart.java | 22 +-
.../metrics/TestSystemMetricsPublisher.java | 4 +-
...estProportionalCapacityPreemptionPolicy.java | 2 +-
.../rmapp/TestRMAppTransitions.java | 28 -
.../attempt/TestRMAppAttemptTransitions.java | 2 +-
.../rmcontainer/TestRMContainerImpl.java | 2 +-
.../TestSchedulerApplicationAttempt.java | 2 +-
.../scheduler/TestSchedulerUtils.java | 4 +-
.../capacity/TestCapacityScheduler.java | 4 +-
.../capacity/TestContainerAllocation.java | 32 +-
.../scheduler/fair/TestFairScheduler.java | 2 +-
.../server/TestContainerManagerSecurity.java | 12 +-
131 files changed, 5073 insertions(+), 1053 deletions(-)
----------------------------------------------------------------------