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/f7e37c6d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f7e37c6d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f7e37c6d Branch: refs/heads/HDFS-1312 Commit: f7e37c6d2ce37415b67e32b84aeef59dc9641dab Parents: fa600a6 fed9bf0 Author: Anu Engineer <aengin...@apache.org> Authored: Thu May 26 08:59:03 2016 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Thu May 26 08:59:03 2016 -0700 ---------------------------------------------------------------------- dev-support/checkstyle/suppressions.xml | 21 + .../hadoop-common/HadoopCommon.cmake | 9 +- .../apache/hadoop/io/FastByteComparisons.java | 2 +- .../apache/hadoop/io/erasurecode/CodecUtil.java | 113 +--- .../io/erasurecode/ErasureCoderOptions.java | 89 +++ .../erasurecode/coder/HHXORErasureDecoder.java | 18 +- .../erasurecode/coder/HHXORErasureEncoder.java | 15 +- .../io/erasurecode/coder/RSErasureDecoder.java | 6 +- .../io/erasurecode/coder/RSErasureEncoder.java | 6 +- .../io/erasurecode/coder/XORErasureDecoder.java | 6 +- .../io/erasurecode/coder/XORErasureEncoder.java | 6 +- .../rawcoder/AbstractRawErasureCoder.java | 220 -------- .../rawcoder/AbstractRawErasureDecoder.java | 181 ------ .../rawcoder/AbstractRawErasureEncoder.java | 146 ----- .../rawcoder/ByteArrayDecodingState.java | 111 ++++ .../rawcoder/ByteArrayEncodingState.java | 81 +++ .../rawcoder/ByteBufferDecodingState.java | 134 +++++ .../rawcoder/ByteBufferEncodingState.java | 98 ++++ .../io/erasurecode/rawcoder/CoderOption.java | 43 -- .../io/erasurecode/rawcoder/CoderUtil.java | 199 +++++++ .../io/erasurecode/rawcoder/DecodingState.java | 55 ++ .../erasurecode/rawcoder/DummyRawDecoder.java | 16 +- .../erasurecode/rawcoder/DummyRawEncoder.java | 15 +- .../rawcoder/DummyRawErasureCoderFactory.java | 10 +- .../io/erasurecode/rawcoder/EncodingState.java | 44 ++ .../io/erasurecode/rawcoder/RSRawDecoder.java | 48 +- .../rawcoder/RSRawDecoderLegacy.java | 66 ++- .../io/erasurecode/rawcoder/RSRawEncoder.java | 45 +- .../rawcoder/RSRawEncoderLegacy.java | 82 +-- .../rawcoder/RSRawErasureCoderFactory.java | 9 +- .../RSRawErasureCoderFactoryLegacy.java | 9 +- .../erasurecode/rawcoder/RawErasureCoder.java | 73 --- .../rawcoder/RawErasureCoderFactory.java | 11 +- .../erasurecode/rawcoder/RawErasureDecoder.java | 137 ++++- .../erasurecode/rawcoder/RawErasureEncoder.java | 135 ++++- .../io/erasurecode/rawcoder/XORRawDecoder.java | 51 +- .../io/erasurecode/rawcoder/XORRawEncoder.java | 57 +- .../rawcoder/XORRawErasureCoderFactory.java | 9 +- .../io/erasurecode/rawcoder/package-info.java | 38 ++ .../io/erasurecode/rawcoder/util/CoderUtil.java | 83 --- .../erasurecode/rawcoder/util/GaloisField.java | 4 +- .../apache/hadoop/ipc/ProtobufRpcEngine.java | 5 +- .../main/java/org/apache/hadoop/ipc/RPC.java | 21 +- .../main/java/org/apache/hadoop/ipc/Server.java | 4 +- .../apache/hadoop/ipc/WritableRpcEngine.java | 564 ------------------- .../metrics2/sink/RollingFileSystemSink.java | 353 ++++++++++-- .../hadoop/security/UserGroupInformation.java | 4 +- .../org/apache/hadoop/util/NativeCrc32.java | 6 +- .../java/org/apache/hadoop/util/ProtoUtil.java | 2 - .../src/main/proto/RpcHeader.proto | 2 +- .../erasurecode/TestCodecRawCoderMapping.java | 29 +- .../hadoop/io/erasurecode/TestCoderBase.java | 14 +- .../erasurecode/rawcoder/TestDummyRawCoder.java | 2 +- .../erasurecode/rawcoder/TestRawCoderBase.java | 50 +- .../org/apache/hadoop/ipc/RPCCallBenchmark.java | 38 +- .../hadoop/ipc/TestMultipleProtocolServer.java | 236 +------- .../apache/hadoop/ipc/TestRPCCallBenchmark.java | 13 - .../apache/hadoop/ipc/TestRPCCompatibility.java | 242 +------- .../apache/hadoop/ipc/TestRPCWaitForProxy.java | 37 +- .../java/org/apache/hadoop/ipc/TestRpcBase.java | 50 +- .../java/org/apache/hadoop/ipc/TestSaslRPC.java | 91 ++- .../sink/RollingFileSystemSinkTestBase.java | 16 +- .../sink/TestRollingFileSystemSink.java | 285 +++++++--- .../TestRollingFileSystemSinkWithLocal.java | 157 ++++++ .../hadoop/security/TestDoAsEffectiveUser.java | 291 ++++------ .../security/TestUserGroupInformation.java | 28 +- .../hadoop-common/src/test/proto/test.proto | 4 +- .../src/test/proto/test_rpc_service.proto | 4 +- .../hadoop/hdfs/AsyncDistributedFileSystem.java | 59 ++ .../hadoop/hdfs/DFSStripedInputStream.java | 7 +- .../hadoop/hdfs/DFSStripedOutputStream.java | 7 +- .../hadoop/hdfs/DistributedFileSystem.java | 3 + .../ClientNamenodeProtocolTranslatorPB.java | 30 +- .../hdfs/web/resources/NoRedirectParam.java | 49 ++ .../java/org/apache/hadoop/hdfs/DFSUtil.java | 21 +- .../hadoop/hdfs/server/balancer/Balancer.java | 2 +- .../erasurecode/StripedReconstructor.java | 7 +- .../datanode/web/webhdfs/ParameterParser.java | 5 + .../datanode/web/webhdfs/WebHdfsHandler.java | 26 +- .../apache/hadoop/hdfs/server/mover/Mover.java | 2 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 3 - .../web/resources/NamenodeWebHdfsMethods.java | 82 ++- .../src/main/webapps/hdfs/dfshealth.html | 2 +- .../hadoop-hdfs/src/site/markdown/WebHDFS.md | 57 +- .../apache/hadoop/hdfs/StripedFileTestUtil.java | 8 +- .../org/apache/hadoop/hdfs/TestAsyncDFS.java | 310 ++++++++++ .../apache/hadoop/hdfs/TestAsyncDFSRename.java | 15 +- .../hadoop/hdfs/TestDFSStripedInputStream.java | 23 +- .../org/apache/hadoop/hdfs/TestDFSUtil.java | 47 +- .../TestClientProtocolWithDelegationToken.java | 119 ---- .../hdfs/server/balancer/TestBalancer.java | 17 +- .../balancer/TestBalancerWithHANameNodes.java | 2 +- .../TestBalancerWithMultipleNameNodes.java | 2 +- .../balancer/TestBalancerWithNodeGroup.java | 4 +- .../TestDataNodeErasureCodingMetrics.java | 16 + .../hadoop/hdfs/server/mover/TestMover.java | 12 +- .../hdfs/server/mover/TestStorageMover.java | 2 +- .../hdfs/server/namenode/FSAclBaseTest.java | 12 +- .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 84 ++- .../sink/TestRollingFileSystemSinkWithHdfs.java | 27 +- ...TestRollingFileSystemSinkWithSecureHdfs.java | 201 +++---- .../v2/app/rm/RMContainerAllocator.java | 176 +++--- .../v2/app/rm/RMContainerRequestor.java | 17 +- .../apache/hadoop/mapreduce/MRJobConfig.java | 11 + .../mapreduce/v2/hs/server/HSAdminServer.java | 3 - .../hadoop/mapred/ResourceMgrDelegate.java | 7 + .../hadoop/mapred/TestClientRedirect.java | 8 + .../hadoop/mapred/TestMROpportunisticMaps.java | 281 +++++++++ .../yarn/api/ApplicationClientProtocol.java | 25 + .../GetNewReservationRequest.java | 41 ++ .../GetNewReservationResponse.java | 71 +++ .../ReservationSubmissionRequest.java | 25 +- .../ReservationSubmissionResponse.java | 46 +- .../main/proto/applicationclient_protocol.proto | 1 + .../src/main/proto/yarn_service_protos.proto | 9 +- .../distributedshell/ApplicationMaster.java | 4 +- .../hadoop/yarn/client/api/YarnClient.java | 23 +- .../yarn/client/api/impl/YarnClientImpl.java | 10 + .../yarn/client/api/impl/TestYarnClient.java | 370 ++++++++---- .../ApplicationClientProtocolPBClientImpl.java | 19 + .../ApplicationClientProtocolPBServiceImpl.java | 21 + .../impl/pb/GetNewReservationRequestPBImpl.java | 77 +++ .../pb/GetNewReservationResponsePBImpl.java | 144 +++++ .../pb/ReservationSubmissionRequestPBImpl.java | 30 + .../pb/ReservationSubmissionResponsePBImpl.java | 59 -- .../logaggregation/AggregatedLogFormat.java | 72 ++- .../nodelabels/CommonNodeLabelsManager.java | 18 +- .../yarn/util/ProcfsBasedProcessTree.java | 11 +- .../yarn/util/TestProcfsBasedProcessTree.java | 66 +-- .../webapp/AHSWebServices.java | 2 - .../nodemanager/DefaultContainerExecutor.java | 22 +- .../containermanager/ContainerManagerImpl.java | 2 +- .../application/ApplicationImpl.java | 80 ++- .../localizer/ContainerLocalizer.java | 40 +- .../logaggregation/AppLogAggregatorImpl.java | 56 +- .../logaggregation/LogAggregationService.java | 15 +- .../event/LogHandlerAppStartedEvent.java | 21 +- .../nodemanager/webapp/NMWebServices.java | 2 - .../impl/container-executor.c | 19 +- .../test/test-container-executor.c | 49 -- .../yarn_server_nodemanager_recovery.proto | 1 + .../TestDefaultContainerExecutor.java | 89 +-- .../amrmproxy/MockResourceManagerFacade.java | 10 +- .../application/TestApplication.java | 45 +- .../MockLocalizerHeartbeatResponse.java | 7 +- .../localizer/TestContainerLocalizer.java | 41 +- .../TestAppLogAggregatorImpl.java | 436 ++++++++++++++ .../TestLogAggregationService.java | 7 +- .../server/resourcemanager/ClientRMService.java | 36 +- .../server/resourcemanager/RMAuditLogger.java | 2 + .../nodelabels/RMNodeLabelsManager.java | 9 +- .../reservation/ReservationInputValidator.java | 7 + .../scheduler/fair/FSLeafQueue.java | 23 +- .../resourcemanager/scheduler/fair/FSQueue.java | 23 + .../scheduler/fair/FSQueueMetrics.java | 25 +- .../scheduler/fair/QueueManager.java | 5 +- .../resourcemanager/webapp/RMWebServices.java | 99 +++- .../webapp/dao/NewReservation.java | 55 ++ .../dao/ReservationSubmissionRequestInfo.java | 11 + .../dao/ReservationSubmissionResponseInfo.java | 54 -- .../ReservationACLsTestBase.java | 61 +- .../resourcemanager/TestClientRMService.java | 287 +++++++--- .../TestContainerResourceUsage.java | 26 +- .../TestReservationSystemWithRMHA.java | 92 ++- .../nodelabels/TestRMNodeLabelsManager.java | 67 ++- .../reservation/ReservationSystemTestUtil.java | 5 +- .../scheduler/fair/TestFSLeafQueue.java | 12 + .../scheduler/fair/TestFairScheduler.java | 44 +- .../webapp/TestRMWebServicesApps.java | 44 +- .../webapp/TestRMWebServicesReservation.java | 351 ++++++++---- .../src/test/resources/submit-reservation.json | 1 + .../src/site/markdown/ReservationSystem.md | 4 +- .../src/site/markdown/ResourceManagerRest.md | 90 ++- pom.xml | 18 + 174 files changed, 6558 insertions(+), 3794 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7e37c6d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
