Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 4ebce9ce9 -> 61516762b
YARN-7963. Updated MockServiceAM unit test to prevent test hang.
Contributed by Chandni Singh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4f1ba14
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4f1ba14
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4f1ba14
Branch: refs/heads/HDFS-7240
Commit: b4f1ba14133568f663da080adf644149253b5b05
Parents: 6ce9f79
Author: Eric Yang <ey...@apache.org>
Authored: Mon Feb 26 18:49:01 2018 -0500
Committer: Eric Yang <ey...@apache.org>
Committed: Mon Feb 26 18:49:01 2018 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/service/MockServiceAM.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4f1ba14/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
index 3e1582d..4373893 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
@@ -196,7 +196,15 @@ public class MockServiceAM extends ServiceMaster {
@Override
public RegisterApplicationMasterResponse registerApplicationMaster(
- String appHostName, int appHostPort, String appTrackingUrl) {
+ String appHostName, int appHostPort, String appTrackingUrl,
+ Map placementConstraintsMap) throws YarnException, IOException {
+ return this.registerApplicationMaster(appHostName, appHostPort,
+ appTrackingUrl);
+ }
+
+ @Override
+ public RegisterApplicationMasterResponse registerApplicationMaster(
+ String appHostName, int appHostPort, String appTrackingUrl) {
RegisterApplicationMasterResponse response = mock(
RegisterApplicationMasterResponse.class);
when(response.getResourceTypes()).thenReturn(
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
