Merge remote-tracking branch 'apache/trunk' into YARN-2928
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4d81ebb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4d81ebb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4d81ebb
Branch: refs/heads/YARN-2928
Commit: e4d81ebb335a928d4806cffe556db35208cfd9a9
Parents: bf08f7f 1004473
Author: Zhijie Shen <[email protected]>
Authored: Tue Mar 3 11:11:41 2015 -0800
Committer: Zhijie Shen <[email protected]>
Committed: Tue Mar 3 11:11:41 2015 -0800
----------------------------------------------------------------------
.../classification/tools/StabilityOptions.java | 5 +-
.../AltKerberosAuthenticationHandler.java | 6 +-
.../authentication/KerberosTestUtils.java | 40 +-
.../authentication/util/TestKerberosUtil.java | 14 +-
hadoop-common-project/hadoop-common/CHANGES.txt | 26 +-
.../org/apache/hadoop/conf/Configuration.java | 6 +-
.../org/apache/hadoop/crypto/CipherSuite.java | 3 +-
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 3 +-
.../hadoop/fs/CommonConfigurationKeys.java | 17 +-
.../java/org/apache/hadoop/fs/FileSystem.java | 7 +-
.../org/apache/hadoop/fs/FilterFileSystem.java | 2 +-
.../java/org/apache/hadoop/fs/StorageType.java | 3 +-
.../apache/hadoop/fs/permission/AclEntry.java | 5 +-
.../org/apache/hadoop/fs/shell/FsUsage.java | 12 +-
.../apache/hadoop/fs/shell/XAttrCommands.java | 2 +-
.../org/apache/hadoop/fs/shell/find/Name.java | 5 +-
.../io/compress/CompressionCodecFactory.java | 28 +-
.../hadoop/metrics2/impl/MetricsConfig.java | 7 +-
.../hadoop/metrics2/impl/MetricsSystemImpl.java | 5 +-
.../hadoop/security/SaslPropertiesResolver.java | 3 +-
.../apache/hadoop/security/SecurityUtil.java | 12 +-
.../hadoop/security/WhitelistBasedResolver.java | 3 +-
.../security/ssl/FileBasedKeyStoresFactory.java | 4 +-
.../apache/hadoop/security/ssl/SSLFactory.java | 5 +-
.../security/ssl/SSLHostnameVerifier.java | 10 +-
.../DelegationTokenAuthenticationHandler.java | 3 +-
.../web/DelegationTokenAuthenticator.java | 3 +-
.../apache/hadoop/util/ComparableVersion.java | 3 +-
.../org/apache/hadoop/util/StringUtils.java | 40 +-
.../src/site/markdown/SecureMode.md | 4 +-
.../src/site/markdown/ServiceLevelAuth.md | 17 +-
.../hadoop/fs/FileSystemContractBaseTest.java | 4 +-
.../hadoop/io/compress/TestCodecFactory.java | 3 +-
.../java/org/apache/hadoop/ipc/TestIPC.java | 2 +-
.../java/org/apache/hadoop/ipc/TestSaslRPC.java | 2 +-
.../hadoop/security/TestSecurityUtil.java | 10 +-
.../security/TestUserGroupInformation.java | 5 +-
.../hadoop/test/TimedOutTestsListener.java | 6 +-
.../org/apache/hadoop/util/TestStringUtils.java | 21 +
.../org/apache/hadoop/util/TestWinUtils.java | 6 +-
.../java/org/apache/hadoop/nfs/NfsExports.java | 5 +-
.../server/CheckUploadContentTypeFilter.java | 4 +-
.../hadoop/fs/http/server/FSOperations.java | 7 +-
.../http/server/HttpFSParametersProvider.java | 4 +-
.../org/apache/hadoop/lib/server/Server.java | 3 +-
.../service/hadoop/FileSystemAccessService.java | 6 +-
.../org/apache/hadoop/lib/wsrs/EnumParam.java | 2 +-
.../apache/hadoop/lib/wsrs/EnumSetParam.java | 3 +-
.../hadoop/lib/wsrs/ParametersProvider.java | 3 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 31 +
.../java/org/apache/hadoop/hdfs/DFSClient.java | 26 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 15 +-
.../apache/hadoop/hdfs/RemoteBlockReader2.java | 24 +-
.../org/apache/hadoop/hdfs/XAttrHelper.java | 19 +-
.../hadoop/hdfs/protocol/HdfsConstants.java | 3 +-
.../datatransfer/DataTransferProtoUtil.java | 26 +
.../hadoop/hdfs/server/balancer/Dispatcher.java | 9 +-
.../BlockStoragePolicySuite.java | 4 +-
.../hdfs/server/common/HdfsServerConstants.java | 15 +-
.../hdfs/server/datanode/DataXceiver.java | 14 +-
.../hdfs/server/datanode/StorageLocation.java | 4 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 3 -
.../hdfs/server/namenode/FSEditLogOp.java | 3 +-
.../hadoop/hdfs/server/namenode/FSImage.java | 10 +-
.../hdfs/server/namenode/FSNamesystem.java | 11 +-
.../namenode/QuotaByStorageTypeEntry.java | 3 +-
.../hdfs/server/namenode/SecondaryNameNode.java | 2 +-
.../hdfs/server/namenode/TransferFsImage.java | 4 +-
.../org/apache/hadoop/hdfs/tools/DFSck.java | 31 +-
.../org/apache/hadoop/hdfs/tools/GetConf.java | 17 +-
.../OfflineEditsVisitorFactory.java | 7 +-
.../offlineImageViewer/FSImageHandler.java | 4 +-
.../org/apache/hadoop/hdfs/web/AuthFilter.java | 3 +-
.../org/apache/hadoop/hdfs/web/ParamFilter.java | 3 +-
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 5 +-
.../hadoop/hdfs/web/resources/EnumParam.java | 3 +-
.../hadoop/hdfs/web/resources/EnumSetParam.java | 3 +-
.../src/main/resources/hdfs-default.xml | 22 +
.../src/site/markdown/HDFSCommands.md | 2 +-
.../src/site/xdoc/HdfsRollingUpgrade.xml | 11 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 12 +
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 10 +
.../org/apache/hadoop/hdfs/TestDFSShell.java | 29 +
.../hdfs/TestRollingUpgradeDowngrade.java | 12 +-
.../TestBlocksWithNotEnoughRacks.java | 7 +-
.../datanode/TestHdfsServerConstants.java | 3 -
.../hadoop/hdfs/server/namenode/TestFsck.java | 14 +-
.../namenode/TestFsckWithMultipleNameNodes.java | 20 +
.../namenode/TestNameNodeOptionParsing.java | 8 -
.../namenode/snapshot/TestSnapshotManager.java | 6 +-
.../src/test/resources/testHDFSConf.xml | 4 +-
hadoop-mapreduce-project/CHANGES.txt | 12 +
.../hadoop/mapred/TaskAttemptListenerImpl.java | 4 +-
.../jobhistory/JobHistoryEventHandler.java | 3 +-
.../hadoop/mapreduce/v2/app/JobEndNotifier.java | 1 -
.../v2/app/rm/RMContainerAllocator.java | 65 +-
.../v2/app/rm/RMContainerRequestor.java | 74 +-
.../mapreduce/v2/app/webapp/AppController.java | 6 +-
.../v2/app/rm/TestRMContainerAllocator.java | 214 ++
.../apache/hadoop/mapreduce/TypeConverter.java | 3 +-
.../apache/hadoop/mapreduce/v2/util/MRApps.java | 6 +-
.../hadoop/mapreduce/TestTypeConverter.java | 6 +-
.../hadoop/filecache/DistributedCache.java | 2 +-
.../org/apache/hadoop/mapred/ClusterStatus.java | 4 +-
.../apache/hadoop/mapred/FileOutputFormat.java | 2 +-
.../java/org/apache/hadoop/mapred/IFile.java | 2 +-
.../apache/hadoop/mapred/JobACLsManager.java | 1 -
.../org/apache/hadoop/mapred/JobClient.java | 8 +-
.../java/org/apache/hadoop/mapred/JobConf.java | 49 +-
.../java/org/apache/hadoop/mapred/Mapper.java | 2 +-
.../org/apache/hadoop/mapred/QueueManager.java | 30 +-
.../org/apache/hadoop/mapred/RecordReader.java | 2 +-
.../java/org/apache/hadoop/mapred/Reducer.java | 14 +-
.../java/org/apache/hadoop/mapred/Task.java | 2 +-
.../hadoop/mapred/TaskUmbilicalProtocol.java | 1 -
.../apache/hadoop/mapred/lib/ChainMapper.java | 40 +-
.../apache/hadoop/mapred/lib/ChainReducer.java | 44 +-
.../hadoop/mapred/lib/MultipleOutputs.java | 29 +-
.../hadoop/mapred/lib/TokenCountMapper.java | 2 +-
.../lib/aggregate/ValueAggregatorJob.java | 2 +-
.../lib/aggregate/ValueAggregatorReducer.java | 3 +-
.../hadoop/mapred/lib/db/DBInputFormat.java | 4 +-
.../org/apache/hadoop/mapreduce/Cluster.java | 1 +
.../apache/hadoop/mapreduce/ClusterMetrics.java | 6 +-
.../apache/hadoop/mapreduce/CryptoUtils.java | 10 +-
.../java/org/apache/hadoop/mapreduce/Job.java | 2 +-
.../org/apache/hadoop/mapreduce/JobContext.java | 2 -
.../hadoop/mapreduce/JobSubmissionFiles.java | 2 +-
.../apache/hadoop/mapreduce/MRJobConfig.java | 8 +
.../org/apache/hadoop/mapreduce/Mapper.java | 9 +-
.../org/apache/hadoop/mapreduce/Reducer.java | 12 +-
.../counters/FileSystemCounterGroup.java | 4 +-
.../mapreduce/filecache/DistributedCache.java | 9 +-
.../lib/aggregate/ValueAggregatorJob.java | 2 +-
.../hadoop/mapreduce/lib/chain/Chain.java | 4 +-
.../hadoop/mapreduce/lib/chain/ChainMapper.java | 10 +-
.../mapreduce/lib/chain/ChainReducer.java | 14 +-
.../hadoop/mapreduce/lib/db/DBInputFormat.java | 7 +-
.../hadoop/mapreduce/lib/db/DBWritable.java | 2 +-
.../mapreduce/lib/join/TupleWritable.java | 2 +-
.../mapreduce/lib/map/MultithreadedMapper.java | 6 +-
.../mapreduce/lib/output/FileOutputFormat.java | 2 +-
.../mapreduce/lib/output/MultipleOutputs.java | 11 +-
.../lib/partition/BinaryPartitioner.java | 2 +-
.../hadoop/mapreduce/task/JobContextImpl.java | 2 -
.../org/apache/hadoop/mapreduce/tools/CLI.java | 9 +-
.../src/main/resources/mapred-default.xml | 16 +
.../src/site/markdown/HistoryServerRest.md | 2 +-
.../java/org/apache/hadoop/fs/TestDFSIO.java | 18 +-
.../org/apache/hadoop/fs/TestFileSystem.java | 4 +-
.../org/apache/hadoop/fs/slive/Constants.java | 6 +-
.../apache/hadoop/fs/slive/OperationData.java | 3 +-
.../apache/hadoop/fs/slive/OperationOutput.java | 4 +-
.../org/apache/hadoop/fs/slive/SliveTest.java | 3 +-
.../java/org/apache/hadoop/io/FileBench.java | 17 +-
.../org/apache/hadoop/mapred/TestMapRed.java | 3 +-
.../hadoop/mapreduce/RandomTextWriter.java | 4 +-
.../apache/hadoop/mapreduce/RandomWriter.java | 5 +-
.../apache/hadoop/examples/DBCountPageView.java | 2 +-
.../hadoop/examples/MultiFileWordCount.java | 2 +-
.../apache/hadoop/examples/QuasiMonteCarlo.java | 4 +-
.../hadoop/examples/RandomTextWriter.java | 4 +-
.../apache/hadoop/examples/RandomWriter.java | 5 +-
.../apache/hadoop/examples/SecondarySort.java | 2 +-
.../org/apache/hadoop/examples/pi/DistBbp.java | 2 +-
.../apache/hadoop/examples/pi/math/Modular.java | 2 +-
.../hadoop/examples/terasort/GenSort.java | 2 +-
.../plugin/versioninfo/VersionInfoMojo.java | 4 +-
.../fs/azure/AzureNativeFileSystemStore.java | 4 +-
.../org/apache/hadoop/tools/CopyListing.java | 14 +-
.../java/org/apache/hadoop/tools/DistCp.java | 4 +-
.../apache/hadoop/tools/DistCpOptionSwitch.java | 2 +-
.../org/apache/hadoop/tools/OptionsParser.java | 2 +-
.../hadoop/tools/mapred/CopyCommitter.java | 4 +-
.../apache/hadoop/tools/mapred/CopyMapper.java | 5 +-
.../hadoop/tools/mapred/CopyOutputFormat.java | 4 +-
.../tools/mapred/RetriableFileCopyCommand.java | 3 +-
.../tools/mapred/UniformSizeInputFormat.java | 4 +-
.../tools/mapred/lib/DynamicInputFormat.java | 4 +-
.../tools/mapred/lib/DynamicRecordReader.java | 12 +-
.../apache/hadoop/tools/util/DistCpUtils.java | 14 +-
.../hadoop/tools/util/RetriableCommand.java | 2 +-
.../hadoop/tools/util/ThrottledInputStream.java | 8 +-
.../src/main/resources/distcp-default.xml | 10 -
.../java/org/apache/hadoop/tools/DistCpV1.java | 4 +-
.../java/org/apache/hadoop/tools/Logalyzer.java | 4 +-
.../gridmix/GridmixJobSubmissionPolicy.java | 3 +-
.../ResourceUsageEmulatorPlugin.java | 2 +-
.../fs/swift/http/RestClientBindings.java | 6 +-
.../hadoop/fs/swift/http/SwiftRestClient.java | 6 +-
.../fs/swift/snative/SwiftNativeFileSystem.java | 6 +-
.../snative/SwiftNativeFileSystemStore.java | 6 +-
.../hadoop/fs/swift/util/SwiftTestUtils.java | 2 +-
.../TestSwiftFileSystemExtendedContract.java | 4 +-
.../hadoop/tools/rumen/HadoopLogsAnalyzer.java | 33 +-
.../apache/hadoop/tools/rumen/InputDemuxer.java | 4 +-
.../apache/hadoop/tools/rumen/JobBuilder.java | 2 +-
.../apache/hadoop/tools/rumen/LoggedTask.java | 3 +-
.../hadoop/tools/rumen/LoggedTaskAttempt.java | 3 +-
.../util/MapReduceJobPropertiesParser.java | 5 +-
.../apache/hadoop/tools/rumen/package-info.java | 8 +-
.../apache/hadoop/streaming/Environment.java | 3 +-
hadoop-yarn-project/CHANGES.txt | 18 +
.../records/ApplicationSubmissionContext.java | 1 +
.../hadoop/yarn/client/cli/ApplicationCLI.java | 7 +-
.../apache/hadoop/yarn/client/cli/NodeCLI.java | 3 +-
.../impl/pb/GetApplicationsRequestPBImpl.java | 6 +-
.../pb/ApplicationSubmissionContextPBImpl.java | 3 +-
.../records/impl/pb/ResourceRequestPBImpl.java | 4 +-
.../org/apache/hadoop/yarn/util/FSDownload.java | 6 +-
.../hadoop/yarn/webapp/hamlet/HamletGen.java | 6 +-
.../registry/client/binding/RegistryUtils.java | 3 +-
.../webapp/AHSWebServices.java | 4 +-
.../timeline/webapp/TimelineWebServices.java | 3 +-
.../hadoop/yarn/server/webapp/WebServices.java | 18 +-
.../hadoop-yarn-server-resourcemanager/pom.xml | 7 +-
.../server/resourcemanager/ClientRMService.java | 3 +-
.../resource/ResourceWeights.java | 3 +-
.../scheduler/AbstractYarnScheduler.java | 9 +
.../scheduler/AppSchedulingInfo.java | 33 +-
.../scheduler/ResourceLimits.java | 40 +
.../scheduler/ResourceUsage.java | 61 +-
.../scheduler/SchedulerApplicationAttempt.java | 6 +-
.../scheduler/capacity/AbstractCSQueue.java | 24 +-
.../scheduler/capacity/CSQueue.java | 11 +-
.../scheduler/capacity/CSQueueUtils.java | 48 -
.../capacity/CapacityHeadroomProvider.java | 16 +-
.../scheduler/capacity/CapacityScheduler.java | 30 +-
.../CapacitySchedulerConfiguration.java | 4 +-
.../scheduler/capacity/LeafQueue.java | 131 +-
.../scheduler/capacity/ParentQueue.java | 53 +-
.../fair/FairSchedulerConfiguration.java | 3 +-
.../scheduler/fair/SchedulingPolicy.java | 3 +-
.../server/resourcemanager/webapp/AppBlock.java | 46 +-
.../server/resourcemanager/webapp/AppPage.java | 4 +
.../resourcemanager/webapp/AppsBlock.java | 5 +-
.../webapp/FairSchedulerAppsBlock.java | 5 +-
.../resourcemanager/webapp/NodesPage.java | 2 +-
.../resourcemanager/webapp/RMWebServices.java | 26 +-
.../resourcemanager/webapp/dao/AppInfo.java | 17 +-
.../yarn/server/resourcemanager/MockAM.java | 11 +-
.../scheduler/TestResourceUsage.java | 2 +-
.../capacity/TestApplicationLimits.java | 32 +-
.../scheduler/capacity/TestCSQueueUtils.java | 250 --
.../capacity/TestCapacityScheduler.java | 85 +-
.../scheduler/capacity/TestChildQueueOrder.java | 36 +-
.../scheduler/capacity/TestLeafQueue.java | 221 +-
.../scheduler/capacity/TestParentQueue.java | 106 +-
.../scheduler/capacity/TestReservations.java | 100 +-
.../webapp/TestRMWebAppFairScheduler.java | 10 +-
.../webapp/TestRMWebServicesApps.java | 3 +-
.../src/site/apt/CapacityScheduler.apt.vm | 368 ---
.../src/site/apt/DockerContainerExecutor.apt.vm | 204 --
.../src/site/apt/FairScheduler.apt.vm | 483 ---
.../src/site/apt/NodeManager.apt.vm | 64 -
.../src/site/apt/NodeManagerCgroups.apt.vm | 77 -
.../src/site/apt/NodeManagerRest.apt.vm | 645 ----
.../src/site/apt/NodeManagerRestart.apt.vm | 86 -
.../src/site/apt/ResourceManagerHA.apt.vm | 233 --
.../src/site/apt/ResourceManagerRest.apt.vm | 3104 ------------------
.../src/site/apt/ResourceManagerRestart.apt.vm | 298 --
.../src/site/apt/SecureContainer.apt.vm | 176 -
.../src/site/apt/TimelineServer.apt.vm | 260 --
.../src/site/apt/WebApplicationProxy.apt.vm | 49 -
.../src/site/apt/WebServicesIntro.apt.vm | 593 ----
.../src/site/apt/WritingYarnApplications.apt.vm | 757 -----
.../hadoop-yarn-site/src/site/apt/YARN.apt.vm | 77 -
.../src/site/apt/YarnCommands.apt.vm | 369 ---
.../hadoop-yarn-site/src/site/apt/index.apt.vm | 82 -
.../src/site/markdown/CapacityScheduler.md | 186 ++
.../site/markdown/DockerContainerExecutor.md.vm | 154 +
.../src/site/markdown/FairScheduler.md | 235 ++
.../src/site/markdown/NodeManager.md | 57 +
.../src/site/markdown/NodeManagerCgroups.md | 57 +
.../src/site/markdown/NodeManagerRest.md | 543 +++
.../src/site/markdown/NodeManagerRestart.md | 53 +
.../src/site/markdown/ResourceManagerHA.md | 140 +
.../src/site/markdown/ResourceManagerRest.md | 2640 +++++++++++++++
.../src/site/markdown/ResourceManagerRestart.md | 181 +
.../src/site/markdown/SecureContainer.md | 135 +
.../src/site/markdown/TimelineServer.md | 231 ++
.../src/site/markdown/WebApplicationProxy.md | 24 +
.../src/site/markdown/WebServicesIntro.md | 569 ++++
.../site/markdown/WritingYarnApplications.md | 591 ++++
.../hadoop-yarn-site/src/site/markdown/YARN.md | 42 +
.../src/site/markdown/YarnCommands.md | 272 ++
.../hadoop-yarn-site/src/site/markdown/index.md | 75 +
287 files changed, 8338 insertions(+), 9250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4d81ebb/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
