YARN-9451. AggregatedLogsBlock shows wrong NM http port. Contributed by Prabhu Joseph

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java

@@ -32,6 +32,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.logaggregation.LogAggregationWebUtils;
 import org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileController;
 import org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileControllerFactory;
+import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 import com.google.inject.Inject;
 
@@ -104,8 +105,9 @@ public class AggregatedLogsBlock extends HtmlBlock {
     } catch (Exception fnf) {
       html.h1()
           .__("Logs not available for " + logEntity
-              + ". Aggregation may not be complete, "
-              + "Check back later or try the nodemanager at " + nodeId).__();
+              + ". Aggregation may not be complete, Check back later or "
+              + "try to find the container logs in the local directory of "
+              + "nodemanager " + nodeId).__();
       if(nmApplicationLogUrl != null)  {
         html.h1()
             .__("Or see application log at " + nmApplicationLogUrl)
@@ -129,6 +131,14 @@ public class AggregatedLogsBlock extends HtmlBlock {
     StringBuilder sb = new StringBuilder();
     String scheme = YarnConfiguration.useHttps(this.conf) ? "https://":
         "http://";
+
+    String webAppURLWithoutScheme =
+        WebAppUtils.getNMWebAppURLWithoutScheme(conf);
+    if (webAppURLWithoutScheme.contains(":")) {
+      String httpPort = webAppURLWithoutScheme.split(":")[1];
+      nodeId = NodeId.fromString(nodeId).getHost() + ":" + httpPort;
+    }
+
     sb.append(scheme).append(nodeId).append("/node/application/").append(appId);
     return sb.toString();
   }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogsBlock.java

@@ -145,7 +145,11 @@ public class TestAggregatedLogsBlock {
     block.getWriter().flush();
     String out = data.toString();
     assertTrue(out
-        .contains("Logs not available for entity. Aggregation may not be complete, Check back later or try the nodemanager at localhost:1234"));
+        .contains("Logs not available for entity. Aggregation may not be "
+        + "complete, Check back later or try to find the container logs "
+        + "in the local directory of nodemanager localhost:1234"));
+    assertTrue(out
+        .contains("Or see application log at http://localhost:8042"));
 
   }