[incubator-heron] branch master updated: Add instance resource usage in container (#3375)

[nwang]

This is an automated email from the ASF dual-hosted git repository.

nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 066dd8e  Add instance resource usage in container (#3375)
066dd8e is described below

commit 066dd8e66367e154604d7d939aad8d1cf19591ee
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Thu Oct 24 17:34:46 2019 -0700

    Add instance resource usage in container (#3375)
    
    * Add instance resource usage in container
    
    * update comment and trigger build
---
 .../tools/ui/resources/static/js/physical-plan.js  | 47 +++++++++++++++++-----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/heron/tools/ui/resources/static/js/physical-plan.js 
b/heron/tools/ui/resources/static/js/physical-plan.js
index 49fe75f..cf43232 100644
--- a/heron/tools/ui/resources/static/js/physical-plan.js
+++ b/heron/tools/ui/resources/static/js/physical-plan.js
@@ -63,16 +63,23 @@
       container.children = _.sortBy(container.children, 'name');
       // Parse index
       container.index = parseInt(container.id.split('-')[1]);
-      // Search for resource config in packing plan
+      // Search for container and instance resource config in packing plan
       container.required_resources = {
-        'cpu': 0,
-        'disk': 0,
-        'ram': 0
+        'cpu': 'unknown',
+        'disk': 'unknown',
+        'ram': 'unknown'
       };
       for (var i in containerPlan) {
         var packing = containerPlan[i];
         if (packing.id === container.index) {
           container.required_resources = packing.required_resources;
+          // Get instance resources
+          var instance_resources = {};
+          for (var j in packing.instances) {
+            var inst = packing.instances[j];
+            instance_resources[inst.component_name + '_' + inst.task_id] = 
inst.instance_resources;
+          }
+          container.instance_resources = instance_resources;
         }
       }
     });
@@ -86,6 +93,18 @@
       return d.children.length;
     });
 
+    function formatByteSize(byteSize) {
+      if (byteSize > 1024 * 1024 * 1024 / 2) {
+        return (byteSize / (1024 * 1024 * 1024)).toFixed(2) + 'GB';
+      } else if (byteSize > 1024 * 1024 / 2) {
+        return (byteSize / (1024 * 1024)).toFixed(2) + 'MB';
+      } else if (byteSize > 1024 / 2) {
+        return (byteSize / 1024).toFixed(2) + 'KB';
+      } else {
+        return byteSize + 'B';
+      }
+    }
+
     /**
      * Config paramaters for container/heron instance layout
      */
@@ -159,15 +178,25 @@
         });
 
     var container_tip = d3.tip()
-        .attr('class', 'd3-tip main text-center container')
+        .attr('class', 'd3-tip main container')
         .offset([8, 0])
         .direction('s')
         .html(function (container) {
+          var instance_cpu = '';
+          var instance_ram = '';
+          var instance_disk = '';
+          if (container.instance_resources) {
+            for (var inst in container.instance_resources) {
+              instance_cpu += '<li>   - ' + inst + ': <span>' + 
container.instance_resources[inst].cpu + '</span></li>';
+              instance_ram += '<li>   - ' + inst + ': <span>' + 
formatByteSize(container.instance_resources[inst].ram) + '</span></li>';
+              instance_disk += '<li>   - ' + inst + ': <span>' + 
formatByteSize(container.instance_resources[inst].disk) + '</span></li>';
+            }
+          }
           return '<ul>' +
-          '<li>cpu required: ' + container.required_resources.cpu + '</li>' +
-          '<li>ram required: ' + (container.required_resources.ram / 
1048576).toFixed(2) + 'MB</li>' +
-          '<li>disk required: ' + (container.required_resources.disk / 
1048576).toFixed(2) + 'MB</li>' +
-          '</ul>';
+              '<li>cpu required: <span>' + container.required_resources.cpu + 
'</span></li>' + instance_cpu +
+              '<li>ram required: <span>' + 
formatByteSize(container.required_resources.ram) + '</span></li>' + 
instance_ram +
+              '<li>disk required: <span>' + 
formatByteSize(container.required_resources.disk) + '</span></li>' + 
instance_disk +
+              '</ul>';
         });
 
     var containerGs = svg.selectAll('.physical-plan')