revert mustache fix since name collision wouldn't happen with the nimbus changes
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 334c651..3109bfe 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -1192,17 +1192,17 @@
result.put("failed", commonAggregateStats.get_failed());
if (commonAggregateStats.is_set_resources_map()) {
result.put(
- "componentRequestedMemOnHeap",
+ "requestedMemOnHeap",
commonAggregateStats.get_resources_map().get(Constants.COMMON_ONHEAP_MEMORY_RESOURCE_NAME)
);
result.put(
- "componentRequestedMemOffHeap",
+ "requestedMemOffHeap",
commonAggregateStats.get_resources_map().get(Constants.COMMON_OFFHEAP_MEMORY_RESOURCE_NAME));
result.put(
- "componentRequestedCpu",
+ "requestedCpu",
commonAggregateStats.get_resources_map().get(Constants.COMMON_CPU_RESOURCE_NAME));
result.put(
- "componentRequestedGenericResourcesComp",
+ "requestedGenericResourcesComp",
prettifyGenericResources(commonAggregateStats.get_resources_map()));
}
return result;
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/topology-page-template.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/topology-page-template.html
index 6af19c3..b67e302 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/topology-page-template.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/topology-page-template.html
@@ -432,10 +432,10 @@
<td>{{executors}}</td>
<td>{{tasks}}</td>
{{#schedulerDisplayResource}}
- <td>{{componentRequestedMemOnHeap}}</td>
- <td>{{componentRequestedMemOffHeap}}</td>
- <td>{{componentRequestedCpu}}</td>
- <td>{{componentRequestedGenericResourcesComp}}</td>
+ <td>{{requestedMemOnHeap}}</td>
+ <td>{{requestedMemOffHeap}}</td>
+ <td>{{requestedCpu}}</td>
+ <td>{{requestedGenericResourcesComp}}</td>
{{/schedulerDisplayResource}}
<td>{{emitted}}</td>
<td>{{transferred}}</td>
@@ -549,10 +549,10 @@
<td>{{executors}}</td>
<td>{{tasks}}</td>
{{#schedulerDisplayResource}}
- <td>{{componentRequestedMemOnHeap}}</td>
- <td>{{componentRequestedMemOffHeap}}</td>
- <td>{{componentRequestedCpu}}</td>
- <td>{{componentRequestedGenericResourcesComp}}</td>
+ <td>{{requestedMemOnHeap}}</td>
+ <td>{{requestedMemOffHeap}}</td>
+ <td>{{requestedCpu}}</td>
+ <td>{{requestedGenericResourcesComp}}</td>
{{/schedulerDisplayResource}}
<td>{{emitted}}</td>
<td>{{transferred}}</td>
