Repository: hadoop Updated Branches: refs/heads/trunk 27c4e90ef -> 013000fbc
YARN-5053. More informative diagnostics when applications killed by a user. Contributed by Eric Badger Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/013000fb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/013000fb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/013000fb Branch: refs/heads/trunk Commit: 013000fbc2081c2b7e78b790fc6d847de92b9384 Parents: 27c4e90 Author: Jason Lowe <jl...@apache.org> Authored: Thu May 12 20:28:36 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Thu May 12 20:28:36 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/013000fb/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 c2c24b9..d68b7b1 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 @@ -751,9 +751,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: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
