Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/637acb6b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/637acb6b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/637acb6b Branch: refs/heads/HDFS-1312 Commit: 637acb6bb91a7e27c8af52d1152a79e5f4fe8cb0 Parents: 0b4799e 2a30386 Author: Arpit Agarwal <[email protected]> Authored: Fri Jan 15 16:10:07 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Fri Jan 15 16:10:07 2016 -0800 ---------------------------------------------------------------------- BUILDING.txt | 14 +- .../main/resources/checkstyle/checkstyle.xml | 12 +- hadoop-common-project/hadoop-common/CHANGES.txt | 56 ++- hadoop-common-project/hadoop-common/pom.xml | 71 ++-- .../hadoop-common/src/CMakeLists.txt | 2 +- .../org/apache/hadoop/http/HttpServer2.java | 3 + .../main/java/org/apache/hadoop/ipc/Client.java | 1 + .../apache/hadoop/metrics2/lib/MutableStat.java | 6 +- .../org/apache/hadoop/net/unix/DomainSocket.c | 2 +- .../src/main/resources/core-default.xml | 6 + .../apache/hadoop/fs/FCStatisticsBaseTest.java | 21 +- .../fs/FileContextMainOperationsBaseTest.java | 2 +- .../org/apache/hadoop/fs/SymlinkBaseTest.java | 3 +- .../apache/hadoop/fs/TestSymlinkLocalFS.java | 4 +- .../io/compress/TestCompressorDecompressor.java | 1 - .../hadoop/metrics2/lib/TestMutableMetrics.java | 14 + .../security/http/RestCsrfPreventionFilter.java | 89 +++++ .../http/TestRestCsrfPreventionFilter.java | 276 +++++++++++++ .../hadoop-hdfs-native-client/pom.xml | 29 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 27 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 5 + .../datanode/fsdataset/impl/BlockPoolSlice.java | 34 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 9 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 13 +- .../hadoop/hdfs/server/namenode/FSImage.java | 14 +- .../hdfs/server/namenode/FSImageFormat.java | 21 +- .../namenode/IllegalReservedPathException.java | 39 ++ .../src/main/resources/hdfs-default.xml | 32 +- .../hadoop/hdfs/TestDFSUpgradeFromImage.java | 16 +- .../fsdataset/impl/TestFsDatasetImpl.java | 97 +++++ .../hdfs/server/namenode/TestStartup.java | 2 +- hadoop-mapreduce-project/CHANGES.txt | 22 +- .../v2/app/rm/RMContainerAllocator.java | 12 + .../org/apache/hadoop/mapreduce/Cluster.java | 67 ++-- .../java/org/apache/hadoop/mapreduce/Job.java | 6 +- .../mapreduce/jobhistory/EventReader.java | 39 +- .../java/org/apache/hadoop/hdfs/NNBench.java | 134 ++++--- .../hadoop-mapreduce-client-nativetask/pom.xml | 49 ++- .../maven/plugin/cmakebuilder/CompileMojo.java | 266 +++++++++++++ .../maven/plugin/cmakebuilder/TestMojo.java | 392 +++++++++++++++++++ .../apache/hadoop/maven/plugin/util/Exec.java | 52 ++- hadoop-project-dist/pom.xml | 88 +++-- hadoop-tools/hadoop-aws/pom.xml | 18 +- .../org/apache/hadoop/fs/s3a/Constants.java | 2 + .../main/java/org/apache/hadoop/fs/s3a/S3A.java | 47 +++ .../org/apache/hadoop/fs/s3a/S3AFileStatus.java | 27 +- .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 17 +- .../src/site/markdown/tools/hadoop-aws/index.md | 12 +- .../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 21 + .../fs/s3a/fileContext/TestS3AFileContext.java | 23 ++ .../TestS3AFileContextCreateMkdir.java | 35 ++ .../TestS3AFileContextMainOperations.java | 60 +++ .../TestS3AFileContextStatistics.java | 60 +++ .../s3a/fileContext/TestS3AFileContextURI.java | 43 ++ .../s3a/fileContext/TestS3AFileContextUtil.java | 34 ++ .../org/apache/hadoop/fs/s3a/yarn/TestS3A.java | 83 ++++ .../fs/s3a/yarn/TestS3AMiniYarnCluster.java | 144 +++++++ .../hadoop-aws/src/test/resources/core-site.xml | 47 ++- .../hadoop/tools/util/ProducerConsumer.java | 55 ++- .../hadoop/tools/util/WorkRequestProcessor.java | 2 + .../hadoop/tools/util/TestDistCpUtils.java | 1 + .../hadoop/tools/util/TestProducerConsumer.java | 84 ++++ hadoop-tools/hadoop-pipes/pom.xml | 64 +-- hadoop-yarn-project/CHANGES.txt | 48 +++ .../yarn/api/records/AMBlackListingRequest.java | 67 ++++ .../records/ApplicationSubmissionContext.java | 23 ++ .../hadoop/yarn/conf/YarnConfiguration.java | 6 +- .../InvalidLabelResourceRequestException.java | 49 +++ .../src/main/proto/yarn_protos.proto | 5 + .../hadoop/yarn/client/cli/RMAdminCLI.java | 2 +- .../hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 +- .../impl/pb/AMBlackListingRequestPBImpl.java | 104 +++++ .../pb/ApplicationSubmissionContextPBImpl.java | 40 ++ .../org/apache/hadoop/yarn/client/NMProxy.java | 9 +- .../apache/hadoop/yarn/client/ServerProxy.java | 1 + .../hadoop/yarn/security/AccessRequest.java | 70 ++++ .../yarn/security/ConfiguredYarnAuthorizer.java | 44 ++- .../apache/hadoop/yarn/security/Permission.java | 47 +++ .../security/YarnAuthorizationProvider.java | 30 +- .../hadoop/yarn/api/TestPBImplRecords.java | 10 + .../apache/hadoop/yarn/webapp/TestWebApp.java | 4 +- .../FileSystemApplicationHistoryStore.java | 17 +- .../hadoop-yarn-server-nodemanager/pom.xml | 45 +-- .../DelegatingLinuxContainerRuntime.java | 12 +- .../runtime/DockerLinuxContainerRuntime.java | 39 +- .../container-executor/impl/configuration.c | 2 +- .../test/test-container-executor.c | 7 + .../containermanager/TestNMProxy.java | 34 +- .../runtime/TestDockerContainerRuntime.java | 48 ++- .../server/resourcemanager/ClientRMService.java | 15 +- .../server/resourcemanager/RMAppManager.java | 38 +- .../server/resourcemanager/ResourceManager.java | 1 - .../server/resourcemanager/rmapp/RMAppImpl.java | 63 ++- .../resourcemanager/rmnode/RMNodeImpl.java | 38 +- .../scheduler/AbstractYarnScheduler.java | 15 + .../scheduler/AppSchedulingInfo.java | 25 +- .../scheduler/SchedulerUtils.java | 6 +- .../scheduler/capacity/AbstractCSQueue.java | 7 +- .../scheduler/capacity/CSQueue.java | 5 +- .../scheduler/capacity/CapacityScheduler.java | 7 +- .../scheduler/fair/FSAppAttempt.java | 25 ++ .../security/QueueACLsManager.java | 22 +- .../resourcemanager/webapp/RMWebServices.java | 3 +- .../resourcemanager/TestApplicationACLs.java | 4 +- .../resourcemanager/TestClientRMService.java | 15 +- .../rmapp/TestRMAppTransitions.java | 58 +++ .../scheduler/TestAppSchedulingInfo.java | 73 ++++ .../scheduler/TestSchedulerUtils.java | 10 +- .../scheduler/fair/TestFSAppAttempt.java | 81 ++++ 109 files changed, 3640 insertions(+), 565 deletions(-) ----------------------------------------------------------------------
