You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/10/30 22:17:56 UTC

[05/12] storm git commit: Fix issues

Fix issues


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bed92d6f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bed92d6f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bed92d6f

Branch: refs/heads/master
Commit: bed92d6f7624244a834006c5188cbfd5dd7b6424
Parents: 416686e
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Oct 29 14:57:55 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Oct 29 15:36:07 2015 -0500

----------------------------------------------------------------------
 storm-core/src/ui/public/index.html                         | 6 +++---
 storm-core/src/ui/public/templates/index-page-template.html | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/bed92d6f/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/index.html b/storm-core/src/ui/public/index.html
index 1cd6445..9eedfb8 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -135,11 +135,11 @@ $(document).ready(function() {
     $.getJSON("/api/v1/topology/summary",function(response,status,jqXHR) {
       $.get("/templates/index-page-template.html", function(template) {
           topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
-          //name, id, owner, status, uptime, num workers, num executors, num tasks, scheduler info
+          //name, owner, status, uptime, num workers, num executors, num tasks, replication count, assigned total mem, assigned total cpu, scheduler info
           dtAutoPage("#topology-summary-table", {
             columnDefs: [
-              {type: "num", targets: [5, 6, 7]},
-              {type: "time-str", targets: [4]}
+              {type: "num", targets: [4, 5, 6, 7, 8, 9]},
+              {type: "time-str", targets: [3]}
             ]
           });
           $('#topology-summary [data-toggle="tooltip"]').tooltip();

http://git-wip-us.apache.org/repos/asf/storm/blob/bed92d6f/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index 47bcdfd..a5a885b 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -150,8 +150,8 @@
           </span>
         </th>
         <th>
-          <span data-toggle="tooltip" data-placement="left" title="This shows information from the scheduler about the latest attempt to schedule the Topology on the cluster.">
-            Scheduler Info
+          <span data-toggle="tooltip" data-placement="above" title="Assigned Total Memory by Scheduler.">
+            Assigned Mem (MB)
           </span>
         </th>
         <th>
@@ -170,7 +170,6 @@
       {{#topologies}}
       <tr>
         <td><a href="/topology.html?id={{encodedId}}">{{name}}</a></td>
-        <td>{{id}}</td>
         <td>{{owner}}</td>
         <td>{{status}}</td>
         <td>{{uptime}}</td>
@@ -178,9 +177,9 @@
         <td>{{executorsTotal}}</td>
         <td>{{tasksTotal}}</td>
         <td>{{replicationCount}}</td>
-        <td>{{schedulerInfo}}</td>
         <td>{{assignedTotalMem}}</td>
         <td>{{assignedTotalCpu}}</td>
+        <td>{{schedulerInfo}}</td>
       </tr>
       {{/topologies}}
     </tbody>