Repository: hadoop Updated Branches: refs/heads/branch-2 1370dfc77 -> bb95a5e18
YARN-5053. More informative diagnostics when applications killed by a user. Contributed by Eric Badger (cherry picked from commit 013000fbc2081c2b7e78b790fc6d847de92b9384) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb95a5e1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb95a5e1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb95a5e1 Branch: refs/heads/branch-2 Commit: bb95a5e18f3c41a2feeee93071b883e88c8ed7e7 Parents: 1370dfc Author: Jason Lowe <[email protected]> Authored: Thu May 12 20:28:36 2016 +0000 Committer: Jason Lowe <[email protected]> Committed: Thu May 12 20:30:10 2016 +0000 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/ClientRMService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb95a5e1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 550b96b..b8d85b2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -750,9 +750,14 @@ public class ClientRMService extends AbstractService implements return KillApplicationResponse.newInstance(true); } + String message = "Kill application " + applicationId + + " received from " + callerUGI; + if(null != Server.getRemoteAddress()) { + message += " at " + Server.getRemoteAddress(); + } this.rmContext.getDispatcher().getEventHandler().handle( new RMAppEvent(applicationId, RMAppEventType.KILL, - "Application killed by user.")); + message)); // For UnmanagedAMs, return true so they don't retry return KillApplicationResponse.newInstance( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
