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 aa...@apache.org on 2021/08/04 08:03:12 UTC
[hadoop] branch branch-3.2 updated (d830e84 -> 1f9a315)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a change to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from d830e84 YARN-9875. Improve fair scheduler configuration store on HDFS. (#3262)
new b9d0412 YARN-10337. Fix failing testcase TestRMHATimelineCollectors.
new 1f9a315 YARN-10337. Amendment to fix import as in HADOOP-17100
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../TestRMHATimelineCollectors.java | 31 ++++++++++++++++------
1 file changed, 23 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: YARN-10337. Fix failing testcase
TestRMHATimelineCollectors.
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b9d0412fd5dbb421297d39d9436d2615ffcf056b
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 a0cd048..75c578b 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
[hadoop] 02/02: YARN-10337. Amendment to fix import as in
HADOOP-17100
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 1f9a315625d3d1bcc8950b56eddc6330297c9bd3
Author: Jim Brennan <jb...@apache.org>
AuthorDate: Wed May 19 22:00:55 2021 +0000
YARN-10337. Amendment to fix import as in HADOOP-17100
(cherry picked from commit 53a1c7653fd3ff0206da8acf3fdbacbf932b932d)
---
.../hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 75c578b..947efa0 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
@@ -28,7 +28,7 @@ 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.function.Supplier;
import java.util.ArrayList;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org