You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jb...@apache.org on 2021/05/19 21:21:05 UTC
[hadoop] branch branch-3.3 updated: YARN-10337. Fix failing
testcase TestRMHATimelineCollectors.
This is an automated email from the ASF dual-hosted git repository.
jbrennan pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 1b3e4cf YARN-10337. Fix failing testcase TestRMHATimelineCollectors.
1b3e4cf is described below
commit 1b3e4cf9ce84ae56fe39968502e39a3281c58b1a
Author: Prabhu Joseph <pr...@apache.org>
AuthorDate: Sun Jul 5 14:22:47 2020 +0530
YARN-10337. Fix failing testcase TestRMHATimelineCollectors.
Contributed by Bilwa S T.
(cherry picked from commit 2bbd00dff498027241a5d84713f4e3f13ac45e65)
---
.../TestRMHATimelineCollectors.java | 31 ++++++++++++++++------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
index d4f156b..f086d08 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
@@ -18,6 +18,7 @@
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.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.api.records.AppCollectorData;
@@ -27,6 +28,8 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.base.Supplier;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -97,16 +100,28 @@ public class TestRMHATimelineCollectors extends RMHATestBase {
assertEquals(collectorAddr2,
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
- // stamp).
- assertEquals(collectorAddr1,
- results2.get(app1.getApplicationId()).getCollectorAddr());
- // addr of app2 should be collectorAddr22 since its version number is
+ // stamp). and addr of app2 should be collectorAddr22 since its version
+ // number is
// greater.
- assertEquals(collectorAddr22,
- results2.get(app2.getApplicationId()).getCollectorAddr());
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @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
nm1.getRegisteringCollectors().clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org