This is an automated email from the ASF dual-hosted git repository. jinglun pushed a change to branch HADOOP-19236-01 in repository https://gitbox.apache.org/repos/asf/hadoop.git
omit 0d3b07ceee5 HADOOP-19236. Incorporate VolcanoEngine Cloud TOS File System Implementation. add 06d36f5a6a1 HADOOP-15984. Update jersey from 1.19 to 2.x. (#7019) add 413f3e73013 HADOOP-19236. Incorporate VolcanoEngine Cloud TOS File System Implementation. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0d3b07ceee5) \ N -- N -- N refs/heads/HADOOP-19236-01 (413f3e73013) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: LICENSE-binary | 28 +- .../hadoop-client-check-invariants/pom.xml | 2 + .../resources/ensure-jars-have-correct-contents.sh | 6 +- .../hadoop-client-check-test-invariants/pom.xml | 1 + .../hadoop-client-integration-tests/pom.xml | 10 +- .../hadoop-client-minicluster/pom.xml | 106 +- .../hadoop-client-runtime/pom.xml | 26 +- hadoop-client-modules/hadoop-client/pom.xml | 76 - .../hadoop-cloud-storage/pom.xml | 14 +- .../hadoop-huaweicloud/pom.xml | 6 + .../apache/hadoop/fs/obs/OBSBlockOutputStream.java | 2 +- .../org/apache/hadoop/fs/obs/OBSInputStream.java | 2 +- hadoop-common-project/hadoop-auth-examples/pom.xml | 4 +- hadoop-common-project/hadoop-auth/pom.xml | 4 +- hadoop-common-project/hadoop-common/pom.xml | 97 +- .../java/org/apache/hadoop/http/HttpServer2.java | 34 +- .../org/apache/hadoop/http/TestHttpServer.java | 18 +- .../org/apache/hadoop/http/TestHttpServerLogs.java | 9 +- hadoop-common-project/hadoop-kms/pom.xml | 15 +- .../hadoop-kms/src/main/conf/kms-log4j.properties | 1 - .../apache/hadoop/crypto/key/kms/server/KMS.java | 14 +- .../key/kms/server/KMSExceptionsProvider.java | 2 +- .../src/main/resources/webapps/kms/WEB-INF/web.xml | 16 +- .../hadoop/crypto/key/kms/server/TestKMS.java | 4 +- .../hadoop-kms/src/test/resources/log4j.properties | 2 - hadoop-common-project/hadoop-nfs/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 5 + hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 11 +- .../fs/http/server/HttpFSExceptionProvider.java | 2 +- .../fs/http/server/HttpFSParametersProvider.java | 2 - .../apache/hadoop/fs/http/server/HttpFSServer.java | 45 +- .../apache/hadoop/lib/wsrs/JSONMapProvider.java | 14 +- .../apache/hadoop/lib/wsrs/ParametersProvider.java | 67 +- .../main/resources/webapps/webhdfs/WEB-INF/web.xml | 18 +- .../src/main/webapp/WEB-INF/web.xml | 18 +- .../hadoop/fs/http/server/TestHttpFSServer.java | 3 +- .../src/test/resources/default-log4j.properties | 1 - hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 10 +- hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 5 + .../federation/router/RouterWebHdfsMethods.java | 3 - hadoop-hdfs-project/hadoop-hdfs/pom.xml | 24 +- .../datanode/web/webhdfs/ExceptionHandler.java | 4 +- .../hdfs/server/namenode/NameNodeHttpServer.java | 27 +- .../web/resources/NamenodeWebHdfsMethods.java | 285 ++- .../org/apache/hadoop/hdfs/web/ParamFilter.java | 103 +- .../hdfs/web/resources/ExceptionHandler.java | 11 +- .../hdfs/web/resources/TokenServiceParam.java | 2 - .../hadoop/hdfs/web/resources/UserProvider.java | 35 +- .../hdfs/web/TestWebHdfsFileSystemContract.java | 10 +- .../src/test/resources/log4j.properties | 4 - .../hadoop-mapreduce-client-app/pom.xml | 44 + .../jobhistory/JobHistoryEventHandler.java | 8 +- .../mapreduce/v2/app/client/MRClientService.java | 28 +- .../hadoop/mapreduce/v2/app/webapp/AMWebApp.java | 19 +- .../mapreduce/v2/app/webapp/AMWebServices.java | 11 +- .../apache/hadoop/mapreduce/v2/app/webapp/App.java | 7 +- .../v2/app/webapp/JAXBContextResolver.java | 15 +- .../mapreduce/v2/app/webapp/TestAMWebApp.java | 45 +- .../mapreduce/v2/app/webapp/TestAMWebServices.java | 245 ++- .../v2/app/webapp/TestAMWebServicesAttempt.java | 145 +- .../v2/app/webapp/TestAMWebServicesAttempts.java | 246 ++- .../v2/app/webapp/TestAMWebServicesJobConf.java | 124 +- .../v2/app/webapp/TestAMWebServicesJobs.java | 434 ++-- .../v2/app/webapp/TestAMWebServicesTasks.java | 427 ++-- .../hadoop-mapreduce-client-common/pom.xml | 5 + .../hadoop-mapreduce-client-core/pom.xml | 20 + .../hadoop-mapreduce-client-hs/pom.xml | 30 + .../mapreduce/v2/hs/HistoryClientService.java | 38 + .../hadoop/mapreduce/v2/hs/webapp/HsWebApp.java | 4 - .../mapreduce/v2/hs/webapp/HsWebServices.java | 34 +- .../v2/hs/webapp/JAXBContextResolver.java | 10 +- .../mapreduce/v2/hs/webapp/TestHsWebServices.java | 253 ++- .../v2/hs/webapp/TestHsWebServicesAttempts.java | 257 ++- .../v2/hs/webapp/TestHsWebServicesJobConf.java | 120 +- .../v2/hs/webapp/TestHsWebServicesJobs.java | 468 ++--- .../v2/hs/webapp/TestHsWebServicesJobsQuery.java | 471 +++-- .../v2/hs/webapp/TestHsWebServicesLogs.java | 398 ++-- .../v2/hs/webapp/TestHsWebServicesLogsExtend.java | 399 ++++ .../v2/hs/webapp/TestHsWebServicesTasks.java | 446 ++--- .../reader/ContainerLogsInfoMessageBodyReader.java | 103 + .../reader/RemoteLogPathsMessageBodyReader.java | 88 + .../hadoop-mapreduce-client-jobclient/pom.xml | 21 + .../hadoop-mapreduce-client-nativetask/pom.xml | 20 + .../hadoop-mapreduce-client-shuffle/pom.xml | 5 + .../hadoop-mapreduce-client/pom.xml | 9 +- .../hadoop-mapreduce-examples/pom.xml | 9 +- hadoop-project/pom.xml | 189 +- hadoop-tools/hadoop-archive-logs/pom.xml | 20 + hadoop-tools/hadoop-archives/pom.xml | 20 + hadoop-tools/hadoop-aws/pom.xml | 20 + hadoop-tools/hadoop-azure-datalake/pom.xml | 21 + hadoop-tools/hadoop-azure/pom.xml | 25 +- hadoop-tools/hadoop-datajoin/pom.xml | 20 + hadoop-tools/hadoop-distcp/pom.xml | 20 + .../hadoop-dynamometer-blockgen/pom.xml | 20 + .../hadoop-dynamometer-infra/pom.xml | 20 + .../hadoop-dynamometer-workload/pom.xml | 20 + hadoop-tools/hadoop-extras/pom.xml | 20 + hadoop-tools/hadoop-federation-balance/pom.xml | 20 + hadoop-tools/hadoop-fs2img/pom.xml | 20 + hadoop-tools/hadoop-gridmix/pom.xml | 20 + hadoop-tools/hadoop-resourceestimator/pom.xml | 53 +- .../service/ResourceEstimatorService.java | 33 +- .../service/GuiceServletConfig.java | 42 - .../service/TestResourceEstimatorService.java | 69 +- hadoop-tools/hadoop-rumen/pom.xml | 20 + hadoop-tools/hadoop-sls/pom.xml | 20 + hadoop-tools/hadoop-streaming/pom.xml | 20 + .../hadoop-yarn/hadoop-yarn-api/pom.xml | 4 +- .../api/records/timeline/TimelineEntities.java | 2 + .../yarn/api/records/timeline/TimelineEntity.java | 11 +- .../yarn/api/records/timeline/TimelineEvent.java | 2 + .../yarn/api/records/timeline/TimelineEvents.java | 5 +- .../api/records/timeline/TimelinePutResponse.java | 7 + .../timeline/reader/TimelineDomainReader.java | 30 +- .../timeline/reader/TimelineEntitiesReader.java | 30 +- .../timeline/reader/TimelinePutResponseReader.java | 29 +- .../timeline/{ => reader}/package-info.java | 2 +- .../timeline/writer/TimelineDomainWriter.java | 48 +- .../timeline/writer/TimelineDomainsWriter.java | 48 +- .../timeline/writer/TimelineEntitiesWriter.java | 48 +- .../timeline/writer/TimelineEntityWriter.java | 48 +- .../timeline/writer/TimelineEventsWriter.java | 43 +- .../timeline/writer/TimelinePutResponseWriter.java | 43 +- .../timeline/{ => writer}/package-info.java | 2 +- .../records/timelineservice/TimelineEntities.java | 2 + .../records/timelineservice/TimelineEntity.java | 6 + .../api/records/timelineservice/TimelineEvent.java | 3 + .../records/timelineservice/TimelineMetric.java | 12 +- .../reader/TimelineDomainReader.java | 30 +- .../reader/TimelineEntitiesReader.java | 30 +- .../reader/TimelineEntityReader.java | 30 +- .../reader}/package-info.java | 2 +- .../writer/TimelineDomainWriter.java | 48 +- .../writer/TimelineEntitiesWriter.java | 48 +- .../writer/TimelineEntitySetWriter.java | 50 +- .../writer/TimelineEntityWriter.java | 42 +- .../writer/TimelineHealthWriter.java | 49 +- .../writer}/package-info.java | 2 +- .../pom.xml | 23 - .../appcatalog/application/YarnServiceClient.java | 80 +- .../src/main/webapp/WEB-INF/web.xml | 8 +- .../pom.xml | 17 + .../distributedshell/ApplicationMaster.java | 10 +- .../distributedshell/TestDSTimelineV10.java | 37 +- .../hadoop-yarn-services-api/pom.xml | 10 +- .../yarn/service/client/ApiServiceClient.java | 110 +- .../src/main/webapp/WEB-INF/web.xml | 8 +- .../apache/hadoop/yarn/service/TestApiServer.java | 53 +- .../hadoop-yarn-services-core/pom.xml | 20 +- .../hadoop/yarn/service/ServiceScheduler.java | 14 +- .../apache/hadoop/yarn/service/utils/HttpUtil.java | 13 +- .../hadoop/yarn/service/ServiceTestUtils.java | 21 +- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 17 +- .../org/apache/hadoop/yarn/client/cli/LogsCLI.java | 268 ++- .../hadoop/yarn/client/cli/SchedConfCLI.java | 138 +- .../apache/hadoop/yarn/client/cli/TestLogsCLI.java | 23 +- .../hadoop/yarn/client/cli/TestSchedConfCLI.java | 114 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 74 +- .../yarn/client/api/impl/DirectTimelineWriter.java | 9 +- .../client/api/impl/FileSystemTimelineWriter.java | 8 +- .../yarn/client/api/impl/TimelineClientImpl.java | 12 +- .../yarn/client/api/impl/TimelineConnector.java | 223 +-- .../client/api/impl/TimelineReaderClientImpl.java | 90 +- .../yarn/client/api/impl/TimelineV2ClientImpl.java | 85 +- .../yarn/client/api/impl/TimelineWriter.java | 64 +- .../hadoop/yarn/logaggregation/LogToolUtils.java | 16 +- ...biddenException.java => ConflictException.java} | 27 +- .../yarn/webapp/GenericExceptionHandler.java | 29 +- .../java/org/apache/hadoop/yarn/webapp/WebApp.java | 32 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 39 +- .../yarn/webapp/YarnJacksonJaxbJsonProvider.java | 2 +- .../hadoop/yarn/webapp/util/WebAppUtils.java | 16 + .../hadoop/yarn/webapp/util/WebServiceClient.java | 52 +- .../yarn/webapp/util/YarnWebServiceUtils.java | 75 +- .../yarn/client/api/impl/TestTimelineClient.java | 80 +- .../api/impl/TestTimelineClientForATS1_5.java | 18 +- .../api/impl/TestTimelineReaderClientImpl.java | 34 +- .../apache/hadoop/yarn/webapp/JerseyTestBase.java | 37 +- .../yarn/webapp/MyTestJAXBContextResolver.java | 11 +- .../hadoop/yarn/webapp/MyTestWebService.java | 2 +- .../org/apache/hadoop/yarn/webapp/TestWebApp.java | 110 +- .../yarn/webapp/util/TestWebServiceClient.java | 7 +- .../hadoop-yarn/hadoop-yarn-csi/pom.xml | 5 - .../pom.xml | 66 +- .../ApplicationHistoryServer.java | 47 +- .../webapp/AHSWebApp.java | 12 +- .../webapp/AHSWebServices.java | 20 +- .../webapp/ContextFactory.java | 2 +- .../webapp/JAXBContextResolver.java | 11 +- .../timeline/webapp/TimelineWebServices.java | 35 +- .../webapp/TestAHSWebServices.java | 461 +++-- .../reader/ContainerLogsInfoListReader.java | 117 ++ .../timeline/reader/TimelineAboutReader.java | 82 + .../timeline/reader/TimelineDomainReader.java | 30 +- .../timeline/reader/TimelineDomainsReader.java | 30 +- .../timeline/reader/TimelineEntitiesReader.java | 30 +- .../timeline/reader/TimelineEntityReader.java | 42 +- .../timeline/reader/TimelineEventsReader.java | 80 + .../timeline/reader/TimelinePutResponseReader.java | 26 +- .../TestTimelineAuthenticationFilterForV1.java | 4 +- .../timeline/webapp/TestTimelineWebServices.java | 929 +++++---- .../webapp/TestTimelineWebServicesWithSSL.java | 17 +- .../hadoop-yarn-server-common/pom.xml | 24 + .../policies/dao/WeightedPolicyInfo.java | 57 +- .../federation/store/records/SubClusterIdInfo.java | 2 +- .../hadoop/yarn/server/webapp/LogServlet.java | 4 +- .../hadoop/yarn/server/webapp/LogWebService.java | 70 +- .../yarn/server/webapp/LogWebServiceUtils.java | 9 +- .../yarn/server/webapp/dao/ContainerLogsInfo.java | 29 +- .../pom.xml | 27 +- .../server/globalpolicygenerator/GPGUtils.java | 29 +- .../GlobalPolicyGenerator.java | 2 +- .../globalpolicygenerator/webapp/GPGWebApp.java | 23 +- .../webapp/GPGWebServices.java | 10 +- .../policygenerator/TestPolicyGenerator.java | 23 +- .../webapp/TestGPGWebServices.java | 76 +- .../src/test/resources/schedulerInfo1.json | 250 +-- .../src/test/resources/schedulerInfo2.json | 374 ++-- .../hadoop-yarn-server-nodemanager/pom.xml | 96 +- .../nodemanager/api/deviceplugin/Device.java | 13 +- .../deviceframework/AssignedDevice.java | 4 +- .../resourceplugin/gpu/AssignedGpuDevice.java | 3 + .../resourceplugin/gpu/GpuDevice.java | 3 + .../nodemanager/webapp/JAXBContextResolver.java | 15 +- .../server/nodemanager/webapp/NMWebAppFilter.java | 37 +- .../server/nodemanager/webapp/NMWebServices.java | 50 +- .../yarn/server/nodemanager/webapp/WebServer.java | 79 +- .../server/nodemanager/webapp/dao/AppsInfo.java | 3 +- .../webapp/dao/NMDeviceResourceInfo.java | 8 + .../nodemanager/webapp/dao/NMResourceInfo.java | 13 + .../webapp/dao/gpu/NMGpuResourceInfo.java | 8 + .../server/nodemanager/webapp/TestNMWebFilter.java | 17 +- .../server/nodemanager/webapp/TestNMWebServer.java | 20 +- .../nodemanager/webapp/TestNMWebServices.java | 492 ++--- .../nodemanager/webapp/TestNMWebServicesApps.java | 404 ++-- .../webapp/TestNMWebServicesAuxServices.java | 155 +- .../webapp/TestNMWebServicesContainers.java | 251 ++- .../nodemanager/webapp/TestNMWebTerminal.java | 19 +- .../hadoop-yarn-server-resourcemanager/pom.xml | 92 +- .../server/resourcemanager/ResourceManager.java | 27 +- .../federation/FederationStateStoreHeartbeat.java | 42 +- .../resourcemanager/scheduler/fair/FSQueue.java | 2 +- .../webapp/JAXBContextResolver.java | 71 +- .../server/resourcemanager/webapp/RMWebApp.java | 34 +- .../resourcemanager/webapp/RMWebAppFilter.java | 33 +- .../resourcemanager/webapp/RMWebServices.java | 15 +- .../resourcemanager/webapp/dao/AppsInfo.java | 2 +- .../webapp/dao/CapacitySchedulerInfo.java | 2 +- .../webapp/dao/CapacitySchedulerQueueInfoList.java | 2 +- .../yarn/server/resourcemanager/TestRMHA.java | 27 +- .../TestFederationRMStateStoreService.java | 22 +- .../recovery/TestFSRMStateStore.java | 23 +- .../webapp/ActivitiesTestUtils.java | 26 +- .../resourcemanager/webapp/TestRMWebApp.java | 29 +- .../webapp/TestRMWebAppFairScheduler.java | 38 +- .../webapp/TestRMWebServiceAppsNodelabel.java | 94 +- .../resourcemanager/webapp/TestRMWebServices.java | 369 ++-- .../webapp/TestRMWebServicesAppAttempts.java | 258 +-- .../TestRMWebServicesAppCustomResourceTypes.java | 85 +- .../webapp/TestRMWebServicesApps.java | 1012 +++++----- .../TestRMWebServicesAppsCustomResourceTypes.java | 97 +- .../webapp/TestRMWebServicesAppsModification.java | 669 ++++--- .../webapp/TestRMWebServicesCapacitySched.java | 177 +- ...TestRMWebServicesCapacitySchedDefaultLabel.java | 139 ++ ...estRMWebServicesCapacitySchedDynamicConfig.java | 185 +- ...icesCapacitySchedDynamicConfigAbsoluteMode.java | 140 ++ ...rvicesCapacitySchedDynamicConfigWeightMode.java | 138 ++ ...esCapacitySchedDynamicConfigWeightModeDQC.java} | 172 +- ...ebServicesCapacitySchedLegacyQueueCreation.java | 114 +- ...pacitySchedLegacyQueueCreationAbsoluteMode.java | 140 ++ ...WebServicesCapacitySchedulerConfigMutation.java | 138 +- ...estRMWebServicesCapacitySchedulerMixedMode.java | 216 +- ...itySchedulerMixedModeAbsoluteAndPercentage.java | 121 ++ ...lerMixedModeAbsoluteAndPercentageAndWeight.java | 120 ++ ...edModeAbsoluteAndPercentageAndWeightVector.java | 123 ++ ...edulerMixedModeAbsoluteAndPercentageVector.java | 121 ++ ...apacitySchedulerMixedModeAbsoluteAndWeight.java | 120 ++ ...ySchedulerMixedModeAbsoluteAndWeightVector.java | 121 ++ ...acitySchedulerMixedModePercentageAndWeight.java | 117 ++ ...chedulerMixedModePercentageAndWeightVector.java | 121 ++ .../TestRMWebServicesConfigurationMutation.java | 412 ++-- .../webapp/TestRMWebServicesContainers.java | 113 +- ...estRMWebServicesCustomResourceTypesCommons.java | 16 +- ...RMWebServicesDelegationTokenAuthentication.java | 54 +- .../webapp/TestRMWebServicesDelegationTokens.java | 471 +++-- .../TestRMWebServicesForCSWithPartitions.java | 218 ++- ...TestRMWebServicesHttpStaticUserPermissions.java | 8 +- .../webapp/TestRMWebServicesNodeLabels.java | 266 +-- .../webapp/TestRMWebServicesNodes.java | 573 +++--- .../webapp/TestRMWebServicesReservation.java | 543 ++--- .../TestRMWebServicesSchedulerActivities.java | 393 ++-- ...esSchedulerActivitiesWithMultiNodesEnabled.java | 149 +- .../webapp/TestRMWebappAuthentication.java | 18 +- .../resourcemanager/webapp/TestWebServiceUtil.java | 104 +- .../TestRMWebServicesFairScheduler.java | 117 +- ...ebServicesFairSchedulerCustomResourceTypes.java | 137 +- .../webapp/helper/AppInfoJsonVerifications.java | 2 +- .../webapp/helper/BufferedClientResponse.java | 23 +- .../helper/JsonCustomResourceTypeTestcase.java | 29 +- .../helper/XmlCustomResourceTypeTestCase.java | 23 +- .../webapp/reader/AppStateReader.java | 71 + .../ApplicationSubmissionContextInfoReader.java | 46 +- .../webapp/reader/LabelsToNodesInfoReader.java | 43 +- .../webapp/reader/NodeLabelsInfoReader.java | 43 +- .../webapp/reader/NodeToLabelsInfoReader.java | 74 + .../webapp/reader/ResourceOptionInfoReader.java | 43 +- .../ApplicationSubmissionContextInfoWriter.java | 89 + .../webapp/writer/ResourceOptionInfoWriter.java | 87 + .../webapp/writer/SchedConfUpdateInfoWriter.java | 87 + .../hadoop/yarn/webapp/TestRMWithCSRFFilter.java | 117 +- .../src/test/resources/delete-reservation.json | 4 +- .../src/test/resources/submit-reservation.json | 62 +- .../src/test/resources/update-reservation.json | 61 +- ...igmutation-absolute-hierarchy-after-update.json | 552 +++--- ...gmutation-absolute-hierarchy-before-update.json | 560 +++--- ...ion-absolute-hierarchy-legacy-after-update.json | 552 +++--- ...on-absolute-hierarchy-legacy-before-update.json | 560 +++--- .../webapp/dynamic-testAbsoluteMode-0.json | 832 ++++---- .../webapp/dynamic-testAbsoluteMode-16.json | 796 ++++---- .../webapp/dynamic-testAbsoluteMode-32.json | 796 ++++---- .../webapp/dynamic-testAbsoluteMode-legacy-0.json | 824 ++++---- .../webapp/dynamic-testPercentageMode-0.json | 808 ++++---- .../webapp/dynamic-testPercentageMode-16.json | 772 ++++---- .../webapp/dynamic-testPercentageMode-32.json | 772 ++++---- .../dynamic-testPercentageMode-legacy-0.json | 772 ++++---- .../resources/webapp/dynamic-testWeightMode-0.json | 808 ++++---- .../webapp/dynamic-testWeightMode-16.json | 772 ++++---- .../webapp/dynamic-testWeightMode-32.json | 772 ++++---- .../webapp/dynamic-testWeightMode-after-aqc.json | 2068 ++++++++++---------- .../webapp/dynamic-testWeightMode-before-aqc.json | 742 +++---- .../webapp/dynamic-testWeightMode-legacy-0.json | 764 ++++---- .../webapp/dynamic-testWeightMode-legacy-16.json | 764 ++++---- .../webapp/dynamic-testWeightMode-legacy-32.json | 764 ++++---- .../dynamic-testWeightMode-legacy-after-aqc.json | 2052 +++++++++---------- .../dynamic-testWeightMode-legacy-before-aqc.json | 734 +++---- ...mixed-testSchedulerAbsoluteAndPercentage-0.json | 820 ++++---- ...ixed-testSchedulerAbsoluteAndPercentage-16.json | 804 ++++---- ...ixed-testSchedulerAbsoluteAndPercentage-32.json | 784 ++++---- ...tSchedulerAbsoluteAndPercentageAndWeight-0.json | 816 ++++---- ...SchedulerAbsoluteAndPercentageAndWeight-16.json | 800 ++++---- ...SchedulerAbsoluteAndPercentageAndWeight-32.json | 780 ++++---- ...dulerAbsoluteAndPercentageAndWeightMixed-0.json | 818 ++++---- ...ulerAbsoluteAndPercentageAndWeightMixed-16.json | 802 ++++---- ...ulerAbsoluteAndPercentageAndWeightMixed-32.json | 782 ++++---- .../mixed-testSchedulerAbsoluteAndWeight-0.json | 820 ++++---- .../mixed-testSchedulerAbsoluteAndWeight-16.json | 804 ++++---- .../mixed-testSchedulerAbsoluteAndWeight-32.json | 784 ++++---- .../mixed-testSchedulerPercentageAndWeight-0.json | 808 ++++---- .../mixed-testSchedulerPercentageAndWeight-16.json | 772 ++++---- .../mixed-testSchedulerPercentageAndWeight-32.json | 772 ++++---- ...er-response-AbsoluteModeLegacyAutoCreation.json | 418 ++-- .../scheduler-response-PerUserResources.json | 578 +++--- ...-response-PercentageModeLegacyAutoCreation.json | 298 +-- .../test/resources/webapp/scheduler-response.json | 490 ++--- .../hadoop-yarn-server-router/pom.xml | 6 + .../apache/hadoop/yarn/server/router/Router.java | 6 +- .../yarn/server/router/webapp/AppsBlock.java | 4 +- .../webapp/DefaultRequestInterceptorREST.java | 2 +- .../yarn/server/router/webapp/FederationBlock.java | 17 +- .../router/webapp/FederationInterceptorREST.java | 10 +- .../server/router/webapp/MetricsOverviewTable.java | 4 +- .../yarn/server/router/webapp/NodeLabelsBlock.java | 5 +- .../yarn/server/router/webapp/NodesBlock.java | 4 +- .../yarn/server/router/webapp/RouterBlock.java | 19 +- .../yarn/server/router/webapp/RouterWebApp.java | 34 +- .../server/router/webapp/RouterWebServiceUtil.java | 159 +- .../server/router/webapp/RouterWebServices.java | 10 +- .../subcluster/TestFederationSubCluster.java | 133 +- .../TestYarnFederationWithCapacityScheduler.java | 64 +- .../fair/TestYarnFederationWithFairScheduler.java | 85 +- .../router/webapp/TestRouterWebServiceUtil.java | 28 +- .../router/webapp/TestRouterWebServicesREST.java | 322 ++- .../TestTimelineServiceClientIntegration.java | 3 + .../pom.xml | 28 + .../pom.xml | 60 +- .../pom.xml | 4 + .../pom.xml | 4 + .../storage/common/HBaseTimelineServerUtils.java | 3 +- .../hadoop-yarn-server-timelineservice/pom.xml | 21 +- .../collector/NodeTimelineCollectorManager.java | 24 +- .../collector/TimelineCollectorWebService.java | 7 +- .../reader/TimelineReaderManager.java | 1 + .../reader/TimelineReaderServer.java | 26 +- .../reader/TimelineReaderWebServices.java | 11 +- .../storage/FileSystemTimelineWriterImpl.java | 4 + .../reader/TestTimelineReaderWebServices.java | 405 ++-- .../reader/TestTimelineReaderWebServicesACL.java | 50 +- .../reader/TimelineAboutReader.java | 82 + .../reader/TimelineEntityReader.java | 31 +- .../reader/TimelineEntitySetReader.java | 94 + .../reader/TimelineHealthReader.java | 30 +- .../hadoop-yarn-server-web-proxy/pom.xml | 8 +- 393 files changed, 31496 insertions(+), 27575 deletions(-) create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesLogsExtend.java create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/reader/ContainerLogsInfoMessageBodyReader.java create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/reader/RemoteLogPathsMessageBodyReader.java delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/GuiceServletConfig.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/reader/TimelineDomainReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/reader/TimelineEntitiesReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/reader/TimelinePutResponseReader.java (64%) copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/{ => reader}/package-info.java (94%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelineDomainWriter.java (53%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelineDomainsWriter.java (53%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelineEntitiesWriter.java (51%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelineEntityWriter.java (53%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelineEventsWriter.java (52%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/writer/TimelinePutResponseWriter.java (51%) copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timeline/{ => writer}/package-info.java (94%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/reader/TimelineDomainReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/reader/TimelineEntitiesReader.java (62%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/reader/TimelineEntityReader.java (63%) copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/{timeline => timelineservice/reader}/package-info.java (93%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/writer/TimelineDomainWriter.java (53%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/writer/TimelineEntitiesWriter.java (51%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/writer/TimelineEntitySetWriter.java (52%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/writer/TimelineEntityWriter.java (54%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/writer/TimelineHealthWriter.java (52%) copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/{timeline => timelineservice/writer}/package-info.java (93%) copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/{ForbiddenException.java => ConflictException.java} (71%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/ContainerLogsInfoListReader.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineAboutReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineDomainReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineDomainsReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineEntitiesReader.java (63%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineEntityReader.java (54%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelineEventsReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/reader/TimelinePutResponseReader.java (68%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java copy hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/{TestRMWebServicesCapacitySchedDynamicConfig.java => TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java} (54%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/AppStateReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ApplicationSubmissionContextInfoReader.java (51%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/LabelsToNodesInfoReader.java (55%) copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeLabelsInfoReader.java (56%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeToLabelsInfoReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ResourceOptionInfoReader.java (54%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ApplicationSubmissionContextInfoWriter.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ResourceOptionInfoWriter.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/SchedConfUpdateInfoWriter.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineAboutReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntityReader.java (63%) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntitySetReader.java copy hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java => hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineHealthReader.java (63%) --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org