Skip to content

Commit cd6a896

Browse files
author
slfan1989
committed
YARN-11320. Fix CheckStyle.
1 parent b5c5803 commit cd6a896

File tree

2 files changed

+11
-5
lines changed
  • hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp

2 files changed

+11
-5
lines changed

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,11 @@ private void applyConcurrentTaskLimits() {
927927
int normalMapRequestLimit = Math.min(
928928
maxRequestedMaps - failedMapRequestLimit,
929929
numScheduledMaps - numScheduledFailMaps);
930+
if (normalMapRequestLimit == 0) {
931+
if (numScheduledMaps == 1) {
932+
normalMapRequestLimit = 1;
933+
}
934+
}
930935
setRequestLimit(PRIORITY_FAST_FAIL_MAP, mapResourceRequest,
931936
failedMapRequestLimit);
932937
setRequestLimit(PRIORITY_MAP, mapResourceRequest, normalMapRequestLimit);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,13 +1542,13 @@ public void testGetSchedulerInfo() {
15421542
Assert.assertTrue(typeInfo instanceof FederationSchedulerTypeInfo);
15431543

15441544
FederationSchedulerTypeInfo federationSchedulerTypeInfo =
1545-
FederationSchedulerTypeInfo.class.cast(typeInfo);
1545+
FederationSchedulerTypeInfo.class.cast(typeInfo);
15461546
Assert.assertNotNull(federationSchedulerTypeInfo);
15471547
List<SchedulerTypeInfo> schedulerTypeInfos = federationSchedulerTypeInfo.getList();
15481548
Assert.assertNotNull(schedulerTypeInfos);
15491549
Assert.assertEquals(4, schedulerTypeInfos.size());
15501550
List<String> subClusterIds =
1551-
subClusters.stream().map(subClusterId -> subClusterId.getId()).collect(Collectors.toList());
1551+
subClusters.stream().map(subClusterId -> subClusterId.getId()).collect(Collectors.toList());
15521552

15531553
for (SchedulerTypeInfo schedulerTypeInfo : schedulerTypeInfos) {
15541554
Assert.assertNotNull(schedulerTypeInfo);
@@ -1562,7 +1562,7 @@ public void testGetSchedulerInfo() {
15621562
Assert.assertNotNull(schedulerInfo);
15631563
Assert.assertTrue(schedulerInfo instanceof CapacitySchedulerInfo);
15641564
CapacitySchedulerInfo capacitySchedulerInfo =
1565-
CapacitySchedulerInfo.class.cast(schedulerInfo);
1565+
CapacitySchedulerInfo.class.cast(schedulerInfo);
15661566
Assert.assertNotNull(capacitySchedulerInfo);
15671567

15681568
// 3. The parent queue name should be root
@@ -1582,14 +1582,15 @@ public void testGetSchedulerInfo() {
15821582
CapacitySchedulerQueueInfoList csSchedulerQueueInfoList = capacitySchedulerInfo.getQueues();
15831583
Assert.assertNotNull(csSchedulerQueueInfoList);
15841584
List<CapacitySchedulerQueueInfo> csQueueInfoList =
1585-
csSchedulerQueueInfoList.getQueueInfoList();
1585+
csSchedulerQueueInfoList.getQueueInfoList();
15861586
Assert.assertEquals(2, csQueueInfoList.size());
15871587
for (CapacitySchedulerQueueInfo csQueueInfo : csQueueInfoList) {
15881588
Assert.assertNotNull(csQueueInfo);
15891589
Assert.assertTrue(queues.contains(csQueueInfo.getQueuePath()));
15901590
}
15911591
}
1592-
1592+
}
1593+
15931594
@Test
15941595
public void testPostDelegationTokenErrorHsr() throws Exception {
15951596
// Prepare delegationToken data

0 commit comments

Comments
 (0)