goiri commented on code in PR #4540:
URL: https://github.com/apache/hadoop/pull/4540#discussion_r922879676
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java:
##########
@@ -1448,13 +1448,52 @@ public UpdateApplicationTimeoutsResponse
updateApplicationTimeouts(
@Override
public GetAllResourceProfilesResponse getResourceProfiles(
GetAllResourceProfilesRequest request) throws YarnException, IOException
{
- throw new NotImplementedException("Code is not implemented");
+ if (request == null) {
+ routerMetrics.incrGetResourceProfilesFailedRetrieved();
+ RouterServerUtil.logAndThrowException("Missing getResourceProfiles
request.", null);
+ }
+ long startTime = clock.getTime();
+ ClientMethod remoteMethod = new ClientMethod("getResourceProfiles",
+ new Class[] {GetAllResourceProfilesRequest.class}, new Object[]
{request});
+ Collection<GetAllResourceProfilesResponse> resourceProfiles;
+ try {
+ resourceProfiles = invokeAppClientProtocolMethod(true, remoteMethod,
+ GetAllResourceProfilesResponse.class);
+ } catch (Exception ex) {
+ routerMetrics.incrGetResourceProfilesFailedRetrieved();
+ LOG.error("Unable to get resource profiles due to exception.", ex);
+ throw ex;
+ }
+ long stopTime = clock.getTime();
Review Comment:
Couldn't we move this and the setting inside of the try?
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterYarnClientUtils.java:
##########
@@ -417,5 +421,51 @@ public static GetQueueInfoResponse mergeQueues(
queueResponse.setQueueInfo(queueInfo);
return queueResponse;
}
+
+ /**
+ * Merges a list of GetAllResourceProfilesResponse.
+ *
+ * @param responses a list of GetAllResourceProfilesResponse to merge.
+ * @return the merged GetAllResourceProfilesResponse.
+ */
+ public static GetAllResourceProfilesResponse
mergeClusterResourceProfilesResponse(
+ Collection<GetAllResourceProfilesResponse> responses) {
+ GetAllResourceProfilesResponse profilesResponse =
+ Records.newRecord(GetAllResourceProfilesResponse.class);
+ Map<String, Resource> profilesMap = new HashMap<>();
+ for (GetAllResourceProfilesResponse response : responses) {
+ if (response != null && response.getResourceProfiles() != null) {
+ for (Map.Entry<String, Resource> entry :
response.getResourceProfiles().entrySet()) {
+ String key = entry.getKey();
+ Resource r1 = profilesMap.getOrDefault(key, null);
+ Resource r2 = entry.getValue();
+ profilesMap.put(key, r1 == null ? r2 : Resources.add(r1, r2));
Review Comment:
I would extract this as:
```
rAdd = r1 == null ? r2 : Resources.add(r1, r2);
```
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java:
##########
@@ -1448,13 +1448,52 @@ public UpdateApplicationTimeoutsResponse
updateApplicationTimeouts(
@Override
public GetAllResourceProfilesResponse getResourceProfiles(
GetAllResourceProfilesRequest request) throws YarnException, IOException
{
- throw new NotImplementedException("Code is not implemented");
+ if (request == null) {
+ routerMetrics.incrGetResourceProfilesFailedRetrieved();
+ RouterServerUtil.logAndThrowException("Missing getResourceProfiles
request.", null);
+ }
+ long startTime = clock.getTime();
+ ClientMethod remoteMethod = new ClientMethod("getResourceProfiles",
+ new Class[] {GetAllResourceProfilesRequest.class}, new Object[]
{request});
+ Collection<GetAllResourceProfilesResponse> resourceProfiles;
+ try {
+ resourceProfiles = invokeAppClientProtocolMethod(true, remoteMethod,
+ GetAllResourceProfilesResponse.class);
+ } catch (Exception ex) {
+ routerMetrics.incrGetResourceProfilesFailedRetrieved();
+ LOG.error("Unable to get resource profiles due to exception.", ex);
+ throw ex;
+ }
+ long stopTime = clock.getTime();
+ routerMetrics.succeededGetResourceProfilesRetrieved(stopTime - startTime);
+ // Merge the GetAllResourceProfilesResponse
Review Comment:
This comment is not very useful
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java:
##########
@@ -1169,4 +1173,64 @@ public void testGetQueueInfo() throws Exception {
Assert.assertEquals(queueInfo.getChildQueues().size(), 12, 0);
Assert.assertEquals(queueInfo.getAccessibleNodeLabels().size(), 1);
}
+
+ @Test
+ public void testGetResourceProfiles() throws Exception {
+ LOG.info("Test FederationClientInterceptor : Get Resource Profiles
request.");
+
+ // null request
+ LambdaTestUtils.intercept(YarnException.class, "Missing
getResourceProfiles request.",
+ () -> interceptor.getResourceProfiles(null));
+
+ // normal request
+ GetAllResourceProfilesRequest request =
GetAllResourceProfilesRequest.newInstance();
+ GetAllResourceProfilesResponse response =
interceptor.getResourceProfiles(request);
+
+ Assert.assertNotNull(response);
+ Map<String, Resource> resProfiles = response.getResourceProfiles();
+
+ Resource maxResProfiles = resProfiles.get("maximum");
+ Assert.assertEquals(maxResProfiles.getMemorySize(), 32768);
Review Comment:
Expected should go first.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
