brumi1024 commented on code in PR #4235:
URL: https://github.com/apache/hadoop/pull/4235#discussion_r861811715
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java:
##########
@@ -1970,5 +1981,113 @@ public void
verifyResourceRequestsGeneric(ResourceRequest request,
enforceExecutionType);
}
+ @Test
+ public void testAppsQueryByQueueShortname() throws Exception {
+ GuiceServletConfig.setInjector(
+ Guice.createInjector(new WebServletModule(CapacityScheduler.class)));
+
+ rm.start();
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
+ RMApp finishedApp = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("root.default")
+ .build());
+ RMApp runningApp1 = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("default")
+ .build());
+
+ RMApp runningApp2 = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("root.default")
+ .build());
+ amNodeManager.nodeHeartbeat(true);
+
+ finishApp(amNodeManager, finishedApp);
+
+ WebResource r = resource();
+
+ ClientResponse response = r.path("ws").path("v1").path("cluster")
+ .path("apps")
+ .queryParam("queue", "default")
+ .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ assertEquals(MediaType.APPLICATION_JSON_TYPE + "; " + JettyUtils.UTF_8,
+ response.getType().toString());
+ JSONObject json = response.getEntity(JSONObject.class);
+ assertEquals("incorrect number of elements", 1, json.length());
+ JSONObject apps = json.getJSONObject("apps");
+ assertEquals("incorrect number of elements", 1, apps.length());
+
+ JSONArray array = apps.getJSONArray("app");
+
+ Set<String> appIds = getApplicationIds(array);
+ assertTrue("Running 1 app should be in the result list!",
Review Comment:
Nit: _Running 1 app should be in the result list_ this sounds strange,
shouldn't this be: runningApp1 should be in the result list?
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java:
##########
@@ -1970,5 +1981,113 @@ public void
verifyResourceRequestsGeneric(ResourceRequest request,
enforceExecutionType);
}
+ @Test
+ public void testAppsQueryByQueueShortname() throws Exception {
+ GuiceServletConfig.setInjector(
+ Guice.createInjector(new WebServletModule(CapacityScheduler.class)));
+
+ rm.start();
+ MockNM amNodeManager = rm.registerNode("127.0.0.1:1234", 2048);
+ RMApp finishedApp = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("root.default")
+ .build());
+ RMApp runningApp1 = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("default")
+ .build());
+
+ RMApp runningApp2 = MockRMAppSubmitter.submit(rm,
+ MockRMAppSubmissionData.Builder
+ .createWithMemory(CONTAINER_MB, rm)
+ .withQueue("root.default")
+ .build());
+ amNodeManager.nodeHeartbeat(true);
+
+ finishApp(amNodeManager, finishedApp);
Review Comment:
Can you please add a finished app submitted with a queue short name,
possibly with a comment to show that the current behaviour is somewhat
expected? The same applies for the other testcase
--
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]
