[36/50] [abbrv] hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/39240b61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/39240b61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/39240b61 Branch: refs/heads/YARN-5972 Commit: 39240b61a163b127eec385decd30ffd96e694c28 Parents: 758b771 Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Tue Sep 12 09:19:12 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index 3112d65..3c4e4d0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @throws YARNFeatureNotEnabledException if resource-profile is disabled + * @throws YarnE
[05/50] [abbrv] hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/39240b61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/39240b61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/39240b61 Branch: refs/heads/HDFS-10467 Commit: 39240b61a163b127eec385decd30ffd96e694c28 Parents: 758b771 Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Tue Sep 12 09:19:12 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index 3112d65..3c4e4d0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @throws YARNFeatureNotEnabledException if resource-profile is disabled + * @throws Yarn
[25/40] hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/39240b61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/39240b61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/39240b61 Branch: refs/heads/trunk Commit: 39240b61a163b127eec385decd30ffd96e694c28 Parents: 758b771 Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Tue Sep 12 09:19:12 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/39240b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index 3112d65..3c4e4d0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @throws YARNFeatureNotEnabledException if resource-profile is disabled + * @throws YarnExcep
[45/50] [abbrv] hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4eb7c905 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4eb7c905 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4eb7c905 Branch: refs/heads/YARN-3926 Commit: 4eb7c9059cd6f7982fdf10208c9aca78ec6b2636 Parents: de43ecb Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Wed Aug 30 15:51:17 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4eb7c905/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/4eb7c905/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index e745697..8456a8e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @throws YARNFeatureNotEnabledException if resource-profile is disabled + * @throws YarnE
[42/42] hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd85313f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd85313f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd85313f Branch: refs/heads/YARN-3926 Commit: dd85313fda1dd07e417febaf8977c0cc412411ec Parents: a7e8f25 Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Tue Aug 22 16:05:19 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd85313f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd85313f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index e745697..8456a8e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @throws YARNFeatureNotEnabledException if resource-profile is disabled + * @throws YarnE
hadoop git commit: YARN-7043. Cleanup ResourceProfileManager. (wangda)
Repository: hadoop Updated Branches: refs/heads/YARN-3926 f461a2d42 -> 7d9f92cf0 YARN-7043. Cleanup ResourceProfileManager. (wangda) Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d9f92cf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d9f92cf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d9f92cf Branch: refs/heads/YARN-3926 Commit: 7d9f92cf0f35f542256480a8adc14fe89b10ec99 Parents: f461a2d Author: Wangda Tan Authored: Mon Aug 21 17:20:06 2017 -0700 Committer: Wangda Tan Committed: Mon Aug 21 17:20:06 2017 -0700 -- .../ams/ApplicationMasterServiceProcessor.java | 8 ++- .../yarn/api/ApplicationClientProtocol.java | 11 ++-- .../YARNFeatureNotEnabledException.java | 45 +++ .../yarn/util/resource/ResourceUtils.java | 21 +++ .../hadoop/yarn/client/api/YarnClient.java | 13 +++-- .../resource/DominantResourceCalculator.java| 6 +- .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../resourcemanager/AMSProcessingChain.java | 2 +- .../server/resourcemanager/ClientRMService.java | 26 ++--- .../resourcemanager/DefaultAMSProcessor.java| 12 ++-- ...pportunisticContainerAllocatorAMService.java | 3 +- .../server/resourcemanager/RMServerUtils.java | 14 - .../resource/ResourceProfilesManager.java | 32 +- .../resource/ResourceProfilesManagerImpl.java | 61 +--- .../scheduler/AbstractYarnScheduler.java| 18 +- .../TestApplicationMasterService.java | 11 ++-- .../resource/TestResourceProfiles.java | 10 +++- 17 files changed, 191 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d9f92cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java index b7d925a..8e76a11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/ams/ApplicationMasterServiceProcessor.java @@ -52,11 +52,13 @@ public interface ApplicationMasterServiceProcessor { * @param request Register Request. * @param response Register Response. * @throws IOException IOException. + * @throws YarnException in critical situation where invalid + * profiles/resources are added. */ - void registerApplicationMaster( - ApplicationAttemptId applicationAttemptId, + void registerApplicationMaster(ApplicationAttemptId applicationAttemptId, RegisterApplicationMasterRequest request, - RegisterApplicationMasterResponse response) throws IOException; + RegisterApplicationMasterResponse response) + throws IOException, YarnException; /** * Allocate call. http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d9f92cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java index e745697..8456a8e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationClientProtocol.java @@ -81,6 +81,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; /** * The protocol between clients and the ResourceManager @@ -604,7 +605,8 @@ public interface ApplicationClientProtocol extends ApplicationBaseProtocol { * @param request request to get all the resource profiles * @return Response containing a map of the profile name to Resource * capabilities - * @throws YarnException if resource profiles are not enabled on the RM + * @thro