YARN-11180. Refactor some code of getNewApplication, submitApplication etc. #4618
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n, forceKillApplication, getApplicationReport.
slfan1989
commented
Jul 24, 2022
...src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
Show resolved
Hide resolved
slfan1989
changed the title
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
goiri
reviewed
Jul 24, 2022
| @@ -364,7 +362,7 @@ public void testForceKillApplicationNotExists() | |||
| Assert.fail(); | |||
| } catch (YarnException e) { | |||
| Assert.assertTrue(e.getMessage().equals( | |||
There was a problem hiding this comment.
Thanks for helping to review the code, I will fix it.
| @@ -364,7 +362,7 @@ public void testForceKillApplicationNotExists() | |||
| Assert.fail(); | |||
| long startTime = clock.getTime(); | ||
| Map<SubClusterId, SubClusterInfo> subclusters = | ||
| Map<SubClusterId, SubClusterInfo> subClusters = |
| try { | ||
| clusterMetrics = invokeConcurrent(subclusters.keySet(), remoteMethod, | ||
| clusterMetrics = invokeConcurrent(subClusters.keySet(), remoteMethod, |
|
|
||
| if (activeSubclusters == null || activeSubclusters.size() < 1) { | ||
| Map<SubClusterId, SubClusterInfo> activeSubClusters) throws YarnException { | ||
| if (activeSubClusters == null || activeSubClusters.size() < 1) { |
There was a problem hiding this comment.
Your suggestion is right, I will modify the code.
| @@ -280,47 +281,47 @@ private SubClusterId getRandomActiveSubCluster( | |||
| public GetNewApplicationResponse getNewApplication( | |||
| GetNewApplicationRequest request) throws YarnException, IOException { | |||
|
|
|||
| long startTime = clock.getTime(); | |||
| if(request == null) { | |||
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
@goiri Please help me review the code again, thank you very much. |
ashutoshcipher
approved these changes
Jul 25, 2022
|
LGTM +1 |
goiri
reviewed
Jul 25, 2022
|
|
||
| if (activeSubclusters == null || activeSubclusters.size() < 1) { | ||
| Map<SubClusterId, SubClusterInfo> activeSubClusters) throws YarnException { | ||
| if (activeSubClusters.isEmpty()) { |
...src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
Show resolved
Hide resolved
| Map<SubClusterId, SubClusterInfo> subClustersActive = | ||
| federationFacade.getSubClusters(true); | ||
|
|
||
| GetNewApplicationResponse response = null; |
There was a problem hiding this comment.
Why not leave the initialization where it was?
| RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_APP, UNKNOWN, | ||
| TARGET_CLIENT_RM_SERVICE, errMsg); | ||
| RouterServerUtil.logAndThrowException(errMsg, null); | ||
| return response; |
There was a problem hiding this comment.
return? Aren't we throwing the exception?
There was a problem hiding this comment.
Your suggestion is right, I will throw exception directly，thank you.
| RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN, | ||
| TARGET_CLIENT_RM_SERVICE, msg, applicationId); | ||
| RouterServerUtil.logAndThrowException(msg, null); | ||
| return response; |
There was a problem hiding this comment.
This pattern is very weird.
There is no way to let know that we always throw the exception?
There was a problem hiding this comment.
I will modify the code.
| @@ -293,17 +288,15 @@ public void testSubmitApplicationEmptyRequest() | |||
| interceptor.submitApplication(null); | |||
| Assert.fail(); | |||
There was a problem hiding this comment.
Thank you for helping to review the code, I will fix it.
|
💔 -1 overall
This message was automatically generated. |
|
@goiri Please help me review the code again, thank you very much! |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
@goiri Please help me to review the code again, thank you very much! |
goiri
approved these changes
Jul 27, 2022
|
🎊 +1 overall
This message was automatically generated. |
|
@goiri Can you help me merge this pr into trunk branch? I want to finish YARN-11177 based on this, thank you very much! |
|
@goiri thank you very much! |
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA: YARN-11180. Refactor some code of getNewApplication, submitApplication, forceKillApplication, getApplicationReport.
1) FederationClientInterceptor#getNewApplication
1.Increase request is empty check
2.Use RouterServerUtil.logAndThrowException instead of throw YarnRuntime Exception.
2) FederationClientInterceptor#submitApplication/forceKillApplication/getApplicationReport/getApplications
1.Use RouterServerUtil.logAndThrowException instead of throw YarnRuntime Exception.
2.Use string.format instead of +
3.Fix Code Style.
3) FederationClientInterceptor#getClusterMetrics
1.Increase request is empty check
4) FederationClientInterceptor#getClusterNodes/getQueueUserAcls/listReservations/getNodeToLabels/getLabelsToNodes/getClusterNodeLabels
1.Use RouterServerUtil.logAndThrowException instead of throw YarnRuntime Exception.