Преглед изворни кода

YARN-3600. AM container link is broken (Naganarasimha G R via tgraves

Thomas Graves пре 10 година
родитељ
комит
5d708a4725

+ 2 - 0
hadoop-yarn-project/CHANGES.txt

@@ -353,6 +353,8 @@ Release 2.8.0 - UNRELEASED
 
 
     YARN-3589. RM and AH web UI display DOCTYPE wrongly. (Rohith via ozawa)
     YARN-3589. RM and AH web UI display DOCTYPE wrongly. (Rohith via ozawa)
 
 
+    YARN-3600. AM container link is broken (Naganarasimha G R via tgraves)
+
 Release 2.7.1 - UNRELEASED
 Release 2.7.1 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 3 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java

@@ -229,8 +229,9 @@ public class RMAppAttemptBlock extends AppAttemptBlock{
         "AM Container:",
         "AM Container:",
         appAttempt.getAmContainerId() == null || containers == null
         appAttempt.getAmContainerId() == null || containers == null
             || !hasAMContainer(appAttemptReport.getAMContainerId(), containers)
             || !hasAMContainer(appAttemptReport.getAMContainerId(), containers)
-            ? "N/A" : root_url("container", appAttempt.getAmContainerId()),
-        String.valueOf(appAttempt.getAmContainerId()))
+            ? null : root_url("container", appAttempt.getAmContainerId()),
+        appAttempt.getAmContainerId() == null ? "N/A" :
+          String.valueOf(appAttempt.getAmContainerId()))
       ._("Node:", node)
       ._("Node:", node)
       ._(
       ._(
         "Tracking URL:",
         "Tracking URL:",