big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-10337. Fix failing testcase TestRMHATimelineCollectors.

Browse Source 
Contributed by Bilwa S T.

(cherry picked from commit 2bbd00dff4)
This commit is contained in:
Prabhu Joseph 2020-07-05 14:22:47 +05:30 committed by Jim Brennan
parent fa4915fdbb
commit 1b3e4cf9ce
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
View File

@ -18,6 +18,7 @@
package org.apache.hadoop.yarn.server.resourcemanager; package org.apache.hadoop.yarn.server.resourcemanager;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.api.records.AppCollectorData; import org.apache.hadoop.yarn.server.api.records.AppCollectorData;
@ -27,6 +28,8 @@
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import com.google.common.base.Supplier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -97,16 +100,28 @@ public void testRebuildCollectorDataOnFailover() throws Exception {
assertEquals(collectorAddr2, assertEquals(collectorAddr2,
results1.get(app2.getApplicationId()).getCollectorAddr()); results1.get(app2.getApplicationId()).getCollectorAddr());
Map<ApplicationId, AppCollectorData> results2
= nm2.nodeHeartbeat(true).getAppCollectors();
// addr of app1 should be collectorAddr1 since it's registering (no time // addr of app1 should be collectorAddr1 since it's registering (no time
// stamp). // stamp). and addr of app2 should be collectorAddr22 since its version
assertEquals(collectorAddr1, // number is
results2.get(app1.getApplicationId()).getCollectorAddr());
// addr of app2 should be collectorAddr22 since its version number is
// greater. // greater.
assertEquals(collectorAddr22, GenericTestUtils.waitFor(new Supplier<Boolean>() {
results2.get(app2.getApplicationId()).getCollectorAddr()); @Override
public Boolean get() {
try {
Map<ApplicationId, AppCollectorData> results2 = nm2
.nodeHeartbeat(true).getAppCollectors();
if (null != results2) {
return collectorAddr1 == results2.get(app1.getApplicationId())
.getCollectorAddr()
&& collectorAddr22 == results2.get(app2.getApplicationId())
.getCollectorAddr();
}
return false;
} catch (Exception e) {
return false;
}
}
}, 300, 10000);
// Now nm1 should get updated collector list // Now nm1 should get updated collector list
nm1.getRegisteringCollectors().clear(); nm1.getRegisteringCollectors().clear();