Updated Branches: refs/heads/trunk 7e89b1116 -> d74b4279d
AMBARI-3469. Allow reduce tasks of any locality. (Billie Rinaldi via mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/d74b4279 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d74b4279 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d74b4279 Branch: refs/heads/trunk Commit: d74b4279dd8b715be6cf75f2b8d153c67f074a34 Parents: 7e89b11 Author: Mahadev Konar <[email protected]> Authored: Mon Oct 7 18:57:14 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Mon Oct 7 18:57:14 2013 -0700 ---------------------------------------------------------------------- .../apache/ambari/eventdb/webservice/WorkflowJsonService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d74b4279/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java index 42d474b..e958deb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java +++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java @@ -374,7 +374,7 @@ public class WorkflowJsonService { data.setMapNodeLocal(processExactLocalityData(taskAttempts, "MAP", "NODE_LOCAL", io)); data.setMapRackLocal(processExactLocalityData(taskAttempts, "MAP", "RACK_LOCAL", io)); data.setMapOffSwitch(processExactLocalityData(taskAttempts, "MAP", "OFF_SWITCH", io)); - data.setReduceOffSwitch(processExactLocalityData(taskAttempts, "REDUCE", "OFF_SWITCH", io)); + data.setReduceOffSwitch(processExactLocalityData(taskAttempts, "REDUCE", null, io)); setRValues(data.getMapNodeLocal(), minr, maxr, io.max); setRValues(data.getMapRackLocal(), minr, maxr, io.max); setRValues(data.getMapOffSwitch(), minr, maxr, io.max); @@ -462,7 +462,7 @@ public class WorkflowJsonService { private static List<DataPoint> processExactLocalityData(List<TaskAttempt> taskAttempts, String taskType, String locality, MinMax io) { List<DataPoint> data = new ArrayList<DataPoint>(); for (TaskAttempt taskAttempt : taskAttempts) { - if (taskType.equals(taskAttempt.getTaskType()) && locality.equals(taskAttempt.getLocality())) { + if (taskType.equals(taskAttempt.getTaskType()) && (locality == null || locality.equals(taskAttempt.getLocality()))) { DataPoint point = new DataPoint(); point.setX(taskAttempt.getStartTime()); point.setY(taskAttempt.getFinishTime() - taskAttempt.getStartTime());
