diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java index 38e0e3b..eec1fad 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java @@ -130,7 +130,8 @@ protected void generateApplicationTable(Block html, continue; } AppAttemptInfo attemptInfo = - new AppAttemptInfo(this.rm, rmAppAttempt, rmApp.getUser()); + new AppAttemptInfo(this.rm, rmAppAttempt, rmApp.getUser(), + WebAppUtils.getHttpSchemePrefix(conf)); String blacklistedNodesCount = "N/A"; Set nodes = RMAppAttemptBlock.getBlacklistedNodes(rm, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java index b1fa80a..8837658 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java @@ -694,7 +694,8 @@ public AppInfo getApp(@Context HttpServletRequest hsr, @GET @Path("/apps/{appid}/appattempts") @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) - public AppAttemptsInfo getAppAttempts(@PathParam("appid") String appId) { + public AppAttemptsInfo getAppAttempts(@Context HttpServletRequest hsr, + @PathParam("appid") String appId) { init(); if (appId == null || appId.isEmpty()) { @@ -712,8 +713,8 @@ public AppAttemptsInfo getAppAttempts(@PathParam("appid") String appId) { AppAttemptsInfo appAttemptsInfo = new AppAttemptsInfo(); for (RMAppAttempt attempt : app.getAppAttempts().values()) { - AppAttemptInfo attemptInfo = - new AppAttemptInfo(rm, attempt, app.getUser()); + AppAttemptInfo attemptInfo = new AppAttemptInfo(rm, attempt, + app.getUser(), hsr.getScheme() + "://"); appAttemptsInfo.add(attemptInfo); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java index 2c7bbd0..b6e95a6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java @@ -27,7 +27,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMAppAttemptBlock; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; @@ -46,7 +45,8 @@ public AppAttemptInfo() { } - public AppAttemptInfo(ResourceManager rm, RMAppAttempt attempt, String user) { + public AppAttemptInfo(ResourceManager rm, RMAppAttempt attempt, String user, + String schemePrefix) { this.startTime = 0; this.containerId = ""; this.nodeHttpAddress = ""; @@ -61,9 +61,9 @@ public AppAttemptInfo(ResourceManager rm, RMAppAttempt attempt, String user) { this.containerId = masterContainer.getId().toString(); this.nodeHttpAddress = masterContainer.getNodeHttpAddress(); this.nodeId = masterContainer.getNodeId().toString(); - this.logsLink = - WebAppUtils.getRunningLogURL("//" + masterContainer.getNodeHttpAddress(), - ConverterUtils.toString(masterContainer.getId()), user); + this.logsLink = WebAppUtils.getRunningLogURL(schemePrefix + + masterContainer.getNodeHttpAddress(), + ConverterUtils.toString(masterContainer.getId()), user); if (rm.getResourceScheduler() instanceof AbstractYarnScheduler) { AbstractYarnScheduler ayScheduler = (AbstractYarnScheduler) rm.getResourceScheduler();