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 0a4ea07e4a6..7672d24402a 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,14 @@ public void serviceStop() throws Exception { serviceTimelinePublisher .serviceAttemptUnregistered(context, diagnostics.toString()); } - String msg = diagnostics.toString() - + "Navigate to the failed component for more details."; + + String msg = getFailureCause() != null ? diagnostics.toString() + + "Navigate to the failed component for more details." : + "Service stopped by user"; amRMClient .unregisterApplicationMaster(FinalApplicationStatus.ENDED, msg, ""); - LOG.info("Service " + app.getName() - + " unregistered with RM, with attemptId = " + context.attemptId - + ", diagnostics = " + diagnostics); + LOG.info("Service {} unregistered with RM, with attemptId = {}," + + " diagnostics = {}", app.getName(), context.attemptId, diagnostics); super.serviceStop(); }