Repository: hadoop Updated Branches: refs/heads/trunk 3d65dbe03 -> c05b84703
YARN-7671. Improve Diagonstic message for stop yarn native service. 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/c05b8470 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c05b8470 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c05b8470 Branch: refs/heads/trunk Commit: c05b84703b7754b6c2fbcec39f22b5d7802563ec Parents: 3d65dbe Author: Jian He <jia...@apache.org> Authored: Fri Jan 12 14:04:15 2018 -0800 Committer: Jian He <jia...@apache.org> Committed: Fri Jan 12 14:04:15 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/service/ClientAMService.java | 6 +++++- .../org/apache/hadoop/yarn/service/ServiceScheduler.java | 11 ++++------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c05b8470/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java index 94dd8d6..fb73f15 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java @@ -22,6 +22,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.util.ExitUtil; import org.apache.hadoop.yarn.api.ApplicationConstants; @@ -117,7 +118,10 @@ public class ClientAMService extends AbstractService @Override public StopResponseProto stop(StopRequestProto requestProto) throws IOException, YarnException { - LOG.info("Stop the service."); + LOG.info("Stop the service by {}", UserGroupInformation.getCurrentUser()); + context.scheduler.getDiagnostics() + .append("Stopped by user " + UserGroupInformation.getCurrentUser()); + // Stop the service in 2 seconds delay to make sure this rpc call is completed. // shutdown hook will be executed which will stop AM gracefully. Thread thread = new Thread() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/c05b8470/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java index 0a4ea07..eb4783f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java @@ -262,13 +262,10 @@ public class ServiceScheduler extends CompositeService { serviceTimelinePublisher .serviceAttemptUnregistered(context, diagnostics.toString()); } - String msg = diagnostics.toString() - + "Navigate to the failed component for more details."; - amRMClient - .unregisterApplicationMaster(FinalApplicationStatus.ENDED, msg, ""); - LOG.info("Service " + app.getName() - + " unregistered with RM, with attemptId = " + context.attemptId - + ", diagnostics = " + diagnostics); + amRMClient.unregisterApplicationMaster(FinalApplicationStatus.ENDED, + diagnostics.toString(), ""); + LOG.info("Service {} unregistered with RM, with attemptId = {} " + + ", diagnostics = {} ", app.getName(), context.attemptId, diagnostics); super.serviceStop(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
