YARN-8900. [Router] Federation: routing getContainers REST invocations transparently to multiple RMs#4543
Merged
goiri merged 8 commits intoapache:trunkfrom Jul 23, 2022
Merged
Conversation
…s transparently to multiple RMs.
|
🎊 +1 overall
This message was automatically generated. |
goiri
reviewed
Jul 11, 2022
| try { | ||
| subClustersActive = federationFacade.getSubClusters(true); | ||
| } catch (YarnException e) { | ||
| LOG.error(e.getLocalizedMessage()); |
Contributor
Author
There was a problem hiding this comment.
Thanks for your help reviewing the code, I will fix it asap.
Contributor
Author
There was a problem hiding this comment.
I will refactor this code to make it easier for other method calls.
|
🎊 +1 overall
This message was automatically generated. |
goiri
reviewed
Jul 14, 2022
| return container; | ||
| } | ||
|
|
||
| public void addAll(ArrayList<ContainerInfo> containersInfo) { |
Member
There was a problem hiding this comment.
Maybe just make this Collection<ContainerInfo>
Contributor
Author
There was a problem hiding this comment.
Thanks for helping to review the code, I will modify the code.
| containersInfo.addAll(containersResponse.getContainers()); | ||
| } | ||
| } catch (Throwable e) { | ||
| LOG.warn("Failed to get containers report. ", e); |
Member
There was a problem hiding this comment.
Trim the space at the end of the string.
Contributor
Author
There was a problem hiding this comment.
OK, I will fix it.
| interceptor.getContainers(req, res, appId, appAttemptId); | ||
| return containers; | ||
| } catch (Exception e) { | ||
| LOG.error("SubCluster {} failed to return GetContainers.", |
| return containers; | ||
| } catch (Exception e) { | ||
| LOG.error("SubCluster {} failed to return GetContainers.", | ||
| info.getSubClusterId()); |
Member
There was a problem hiding this comment.
Should we print the specific error?
goiri
reviewed
Jul 15, 2022
| } | ||
|
|
||
| public void addAll(Collection<ContainerInfo> containersInfo) { | ||
| container.addAll(new ArrayList<>(containersInfo)); |
Member
There was a problem hiding this comment.
You don't need to create the ArrayList.
public void addAll(Collection<ContainerInfo> containersInfo) {
container.addAll(containersInfo);
}
Should just work: https://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html#addAll(java.util.Collection)
Contributor
Author
There was a problem hiding this comment.
Thanks for the suggestion, I will modify the code.
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.*; |
| } | ||
|
|
||
| try { | ||
| ClientMethod remoteMethod = new ClientMethod("getContainers", |
Member
There was a problem hiding this comment.
The code would look more intuitive as:
Class[] argsClasses = new Class[]{
HttpServletRequest.class, HttpServletResponse.class, String.class, String.class};
Object[] args = new Object[]{req, res, appId, appAttemptId}
ClientMethod remoteMethod = new ClientMethod("getContainers", argsClasses, args);
Contributor
Author
There was a problem hiding this comment.
your suggestion is great!
| // Send the requests in parallel | ||
| CompletionService<R> compSvc = new ExecutorCompletionService<>(this.threadpool); | ||
|
|
||
| for (final SubClusterInfo info : subClusterInfo) { |
Member
There was a problem hiding this comment.
You could pass directly:
Collection<SubClusterInfo> clusterIds
No need to make it an array list.
Contributor
Author
There was a problem hiding this comment.
Thanks a lot for the advice, let me learn a lot, the code has been modified.
| try { | ||
| Method method = DefaultRequestInterceptorREST.class. | ||
| getMethod(request.getMethodName(), request.getTypes()); | ||
| return clazz.cast(method.invoke(interceptor, request.getParams())); |
Member
There was a problem hiding this comment.
Extract to make it clear what type is each thing.
Contributor
Author
There was a problem hiding this comment.
I added cast to R.
| @Test | ||
| public void testGetContainersNotExists() { | ||
| ApplicationId appId = ApplicationId.newInstance(Time.now(), 1); | ||
| ContainersInfo response = |
|
|
||
| @Test | ||
| public void testGetContainersWrongFormat() { | ||
| ContainersInfo response = |
| ApplicationAttemptId appAttempt = | ||
| ApplicationAttemptId.newInstance(appId, 1); | ||
|
|
||
| ContainersInfo responseGet = interceptor.getContainers(null, null, |
Member
There was a problem hiding this comment.
Move all the args to the second line:
ContainersInfo responseGet = interceptor.getContainers(
null, null, appId.toString(), appAttempt.toString());
| Assert.assertNotNull(response); | ||
| Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId)); | ||
|
|
||
| ApplicationAttemptId appAttempt = |
| }); | ||
| } | ||
|
|
||
| for (int i = 0; i < subClusterInfo.size(); i++) { |
Member
There was a problem hiding this comment.
This would be cleaner as:
for (final subClusterInfo : subClusterInfos) {
|
🎊 +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 16, 2022
...test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
Outdated
Show resolved
Hide resolved
|
🎊 +1 overall
This message was automatically generated. |
goiri
reviewed
Jul 17, 2022
...ter/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
Outdated
Show resolved
Hide resolved
...test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
Outdated
Show resolved
Hide resolved
|
🎊 +1 overall
This message was automatically generated. |
Contributor
Author
|
@goiri Please help to review the code again,thank you very much! |
goiri
approved these changes
Jul 18, 2022
Contributor
Author
|
@goiri Can you help merge this pr into the trunk branch? I will continue to improve the REST APIs for Router. YARN-11212 This pr will be followed up. I need to use this method |
goiri
approved these changes
Jul 23, 2022
Contributor
Author
|
@goiri Thanks for your help reviewing the code! |
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
…s transparently to multiple RMs (apache#4543)
freeeshi
reviewed
Dec 26, 2022
| Future<R> future = compSvc.take(); | ||
| R response = future.get(); | ||
| if (response != null) { | ||
| results.put(clusterId, response); |
There was a problem hiding this comment.
hi，@slfan1989，I have a question.
- Operation
compSvc.take()is not guaranteed to be in the same order as operationcompSvc.submit(), in addition, clusterIds type might be Set. So,clusterId->responsemaybe mistake? - Can we do this like
FederationClientInterceptor#invokeConcurrent?
Contributor
Author
There was a problem hiding this comment.
Thank you very much for your feedback, I agree with your description. For the results of the FederationInterceptorREST interface, we will integrate the results returned by all subClusters. This part does not care about the return order of multi-threads. I've submitted a Follow Up pr to fix this, thanks again!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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-8900. [Router] Federation: routing getContainers REST invocations transparently to multiple RMs