Merge branch 'trunk' into HDFS-6584
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/555900a9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/555900a9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/555900a9 Branch: refs/heads/HDFS-6581 Commit: 555900a9dc039624f902fc2c838047873fbfb23c Parents: e69954d 6b441d2 Author: Jing Zhao <ji...@apache.org> Authored: Wed Aug 27 10:32:30 2014 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Wed Aug 27 10:32:30 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 275 +++++++----- .../dev-support/findbugsExcludeFile.xml | 5 + .../src/contrib/bash-tab-completion/hadoop.sh | 28 +- .../src/main/bin/hadoop-config.cmd | 10 +- .../hadoop-common/src/main/bin/hadoop-config.sh | 10 +- .../src/main/bin/hadoop-functions.sh | 64 ++- .../hadoop-common/src/main/bin/hadoop.cmd | 20 + .../hadoop-common/src/main/conf/hadoop-env.sh | 11 + .../java/org/apache/hadoop/io/SequenceFile.java | 9 +- .../org/apache/hadoop/ipc/FairCallQueue.java | 449 +++++++++++++++++++ .../apache/hadoop/ipc/FairCallQueueMXBean.java | 27 ++ .../org/apache/hadoop/ipc/RpcMultiplexer.java | 32 ++ .../ipc/WeightedRoundRobinMultiplexer.java | 2 +- .../hadoop/util/ApplicationClassLoader.java | 219 +++++++++ .../java/org/apache/hadoop/util/RunJar.java | 115 ++++- .../apache/hadoop/security/hadoop_user_info.c | 10 + .../apache/hadoop/ipc/TestFairCallQueue.java | 392 ++++++++++++++++ .../apache/hadoop/util/ClassLoaderCheck.java | 33 ++ .../hadoop/util/ClassLoaderCheckMain.java | 34 ++ .../hadoop/util/ClassLoaderCheckSecond.java | 24 + .../hadoop/util/ClassLoaderCheckThird.java | 24 + .../hadoop/util/TestApplicationClassLoader.java | 136 ++++++ .../java/org/apache/hadoop/util/TestRunJar.java | 66 ++- .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 6 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 31 ++ .../hadoop-hdfs/src/main/bin/hdfs-config.sh | 15 +- .../hdfs/protocol/EncryptionZoneWithId.java | 17 + .../datanode/fsdataset/impl/FsVolumeImpl.java | 45 +- .../namenode/EncryptionFaultInjector.java | 17 + .../server/namenode/EncryptionZoneManager.java | 17 + .../snapshot/DirectoryWithSnapshotFeature.java | 10 +- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- .../hadoop-hdfs/src/site/apt/LibHdfs.apt.vm | 29 +- .../org/apache/hadoop/hdfs/MiniDFSCluster.java | 119 ++++- .../hdfs/MiniDFSClusterWithNodeGroup.java | 26 +- .../org/apache/hadoop/hdfs/TestSafeMode.java | 2 +- .../TestBlockHasMultipleReplicasOnSameDN.java | 5 +- ...TestDnRespectsBlockReportSplitThreshold.java | 6 +- .../namenode/ha/TestPipelinesFailover.java | 28 ++ .../namenode/metrics/TestNameNodeMetrics.java | 2 +- .../namenode/snapshot/TestSnapshotDeletion.java | 77 +++- hadoop-mapreduce-project/CHANGES.txt | 30 +- hadoop-mapreduce-project/bin/mapred-config.sh | 20 +- .../jobhistory/TestJobHistoryEventHandler.java | 30 +- .../v2/jobhistory/JobHistoryUtils.java | 4 +- .../apache/hadoop/mapreduce/v2/util/MRApps.java | 3 +- .../hadoop/mapreduce/v2/util/TestMRApps.java | 5 +- .../java/org/apache/hadoop/mapred/JobConf.java | 94 +--- .../java/org/apache/hadoop/mapred/MapTask.java | 37 +- .../hadoop/mapreduce/util/ConfigUtil.java | 2 + .../src/main/resources/mapred-default.xml | 107 ++++- .../apt/PluggableShuffleAndPluggableSort.apt.vm | 8 +- .../org/apache/hadoop/mapred/TestJobConf.java | 15 +- .../org/apache/hadoop/conf/TestJobConf.java | 20 +- .../apache/hadoop/mapred/TestComparators.java | 61 ++- .../apache/hadoop/mapred/TestMapOutputType.java | 62 ++- .../org/apache/hadoop/mapred/TestMapRed.java | 28 +- .../mapred/lib/TestKeyFieldBasedComparator.java | 25 +- .../apache/hadoop/mapreduce/TestMapReduce.java | 30 +- .../apache/hadoop/mapreduce/v2/TestMRJobs.java | 5 +- .../hadoop/mapred/gridmix/TestHighRamJob.java | 12 +- hadoop-yarn-project/CHANGES.txt | 32 ++ hadoop-yarn-project/hadoop-yarn/bin/yarn | 1 + .../hadoop-yarn/bin/yarn-config.sh | 16 +- .../dev-support/findbugs-exclude.xml | 7 + .../hadoop/yarn/api/records/ContainerId.java | 10 +- .../hadoop/yarn/conf/YarnConfiguration.java | 9 + .../yarn/util/ApplicationClassLoader.java | 170 +------ .../src/main/resources/yarn-default.xml | 18 +- .../apache/hadoop/yarn/api/TestContainerId.java | 4 +- .../yarn/util/TestApplicationClassLoader.java | 136 ------ .../FileSystemApplicationHistoryStore.java | 14 +- .../TestFileSystemApplicationHistoryStore.java | 62 ++- .../nodemanager/LinuxContainerExecutor.java | 18 +- .../nodemanager/TestLinuxContainerExecutor.java | 7 + .../recovery/RMStateStoreFactory.java | 13 +- .../scheduler/AbstractYarnScheduler.java | 13 + .../scheduler/fair/FSAppAttempt.java | 6 - .../scheduler/fair/FSParentQueue.java | 11 +- .../resourcemanager/scheduler/fair/FSQueue.java | 19 +- .../scheduler/fair/FSQueueMetrics.java | 17 +- .../scheduler/fair/FairScheduler.java | 4 + .../scheduler/fair/QueueManager.java | 10 +- .../scheduler/fair/Schedulable.java | 7 - .../scheduler/fair/SchedulingPolicy.java | 27 +- .../fair/policies/ComputeFairShares.java | 34 +- .../DominantResourceFairnessPolicy.java | 9 + .../fair/policies/FairSharePolicy.java | 8 + .../scheduler/fair/policies/FifoPolicy.java | 8 + .../resourcemanager/webapp/AboutBlock.java | 1 + .../resourcemanager/webapp/dao/ClusterInfo.java | 8 + .../TestWorkPreservingRMRestart.java | 13 + .../scheduler/fair/FakeSchedulable.java | 5 - .../scheduler/fair/TestFairScheduler.java | 139 +++++- .../fair/TestFairSchedulerFairShare.java | 68 ++- .../webapp/TestRMWebServices.java | 2 +- 96 files changed, 3130 insertions(+), 843 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/555900a9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ----------------------------------------------------------------------