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 su...@apache.org on 2019/02/25 09:59:36 UTC
[hadoop] branch branch-3.2 updated: YARN-9168. DistributedShell
client timeout should be -1 by default. Contributed by Zhankun Tang.
This is an automated email from the ASF dual-hosted git repository.
sunilg pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 359e459 YARN-9168. DistributedShell client timeout should be -1 by default. Contributed by Zhankun Tang.
359e459 is described below
commit 359e459df1f9dee8504d7d54c2a4ad256fa3db26
Author: Sunil G <su...@apache.org>
AuthorDate: Mon Feb 25 15:28:45 2019 +0530
YARN-9168. DistributedShell client timeout should be -1 by default. Contributed by Zhankun Tang.
(cherry picked from commit 6cec90653dc2ae60a10262745997ea91dd872a8b)
---
.../hadoop/yarn/applications/distributedshell/Client.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
index 3a96770..408afe3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
@@ -1072,14 +1072,17 @@ public class Client {
+ " YarnState=" + state.toString() + ", DSFinalStatus=" + dsStatus.toString()
+ ". Breaking monitoring loop");
return false;
- }
+ }
- if (System.currentTimeMillis() > (clientStartTime + clientTimeout)) {
- LOG.info("Reached client specified timeout for application. Killing application");
+ // The value equal or less than 0 means no timeout
+ if (clientTimeout > 0
+ && System.currentTimeMillis() > (clientStartTime + clientTimeout)) {
+ LOG.info("Reached client specified timeout for application. " +
+ "Killing application");
forceKillApplication(appId);
- return false;
+ return false;
}
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org