소스 검색

MAPREDUCE-6816. Progress bars in Web UI always at 100%. Contributed by Shen Yinjie.

(cherry picked from commit da4ecc9f8223ac82bff8483594fb29be2f8d4d34)
Akira Ajisaka 8 년 전
부모
커밋
03854f0bc5

+ 1 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

@@ -125,7 +125,7 @@ public class TaskPage extends AppView {
 
       for (TaskAttempt attempt : getTaskAttempts()) {
         TaskAttemptInfo ta = new TaskAttemptInfo(attempt, true);
-        String progress = StringUtils.formatPercent(ta.getProgress() / 100, 2);
+        String progress = StringUtils.format("%.2f", ta.getProgress());
 
         String nodeHttpAddr = ta.getNode();
         String diag = ta.getNote() == null ? "" : ta.getNote();

+ 1 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java

@@ -94,7 +94,7 @@ public class TasksBlock extends HtmlBlock {
 
       TaskInfo info = new TaskInfo(task);
       String tid = info.getId();
-      String pct = StringUtils.formatPercent(info.getProgress() / 100, 2);
+      String pct = StringUtils.format("%.2f", info.getProgress());
       tasksTableData.append("[\"<a href='").append(url("task", tid))
       .append("'>").append(tid).append("</a>\",\"")
       //Progress bar

+ 2 - 2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java

@@ -104,12 +104,12 @@ public class JobInfo {
     this.mapsCompleted = job.getCompletedMaps();
     this.mapProgress = report.getMapProgress() * 100;
     this.mapProgressPercent =
-        StringUtils.formatPercent(report.getMapProgress(), 2);
+        StringUtils.format("%.2f", getMapProgress());
     this.reducesTotal = job.getTotalReduces();
     this.reducesCompleted = job.getCompletedReduces();
     this.reduceProgress = report.getReduceProgress() * 100;
     this.reduceProgressPercent =
-        StringUtils.formatPercent(report.getReduceProgress(), 2);
+        StringUtils.format("%.2f", getReduceProgress());
 
     this.acls = new ArrayList<ConfEntryInfo>();
     if (hasAccess) {