diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index f3dacd6..90e63c1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -1014,9 +1014,19 @@ private String getAppAttemptFailedDiagnostics(RMAppEvent event) { + " failed due to " + failedEvent.getDiagnostics() + ". Failing the application."; } else if (this.isNumAttemptsBeyondThreshold) { - msg = "Application " + this.getApplicationId() + " failed " - + this.maxAppAttempts + " times due to " - + failedEvent.getDiagnostics() + ". Failing the application."; + int globalLimit = conf.getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, + YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS); + msg = String.format( + "Application %s failed %d times%s%s due to %s. Failing the application.", + getApplicationId(), + maxAppAttempts, + (attemptFailuresValidityInterval <= 0 ? "" + : (" in previous " + attemptFailuresValidityInterval + + " milliseconds")), + (globalLimit == maxAppAttempts) ? "" + : (" (global limit =" + globalLimit + + "; local limit is =" + maxAppAttempts + ")"), + failedEvent.getDiagnostics()); } return msg; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 684dde8..5171bba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -1459,9 +1459,9 @@ private String getAMContainerCrashedDiagnostics( .append(status.getDiagnostics()); if (this.getTrackingUrl() != null) { diagnosticsBuilder.append("For more detailed output,").append( - " check application tracking page: ").append( + " check the application tracking page: ").append( this.getTrackingUrl()).append( - " Then, click on links to logs of each attempt.\n"); + " Then click on links to logs of each attempt.\n"); } return diagnosticsBuilder.toString(); }