Author: challngr Date: Fri Sep 18 16:05:20 2015 New Revision: 1703896 URL: http://svn.apache.org/viewvc?rev=1703896&view=rev Log: UIMA-4569 Adjust viz for memory-only reported by OR.
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1703896&r1=1703895&r2=1703896&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original) +++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Fri Sep 18 16:05:20 2015 @@ -215,9 +215,9 @@ class DuccUtil(DuccBase): return False resp = conn.getresponse() - #print 'response code', resp.status, resp.reason + print 'response code', resp.status, resp.reason data = resp.read() - #print 'Data:', data + print 'Data:', data if ( resp.status == 200 ): # it will be simple json that Python will see as lists and maps so we can just eval it @@ -293,7 +293,7 @@ class DuccUtil(DuccBase): classpath = self.DUCC_HOME + '/lib/uima-ducc/*:' + classpath dburl = self.ducc_properties.get('ducc.state.database.url') - cmd = ' '.join([self.java(), '-DDUCC_HOME=/home/challngr/ducc_runtime_db', '-cp', classpath, main, dburl]) + cmd = ' '.join([self.java(), '-DDUCC_HOME=' + self.DUCC_HOME, '-cp', classpath, main, dburl]) print cmd self.spawn(cmd) Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java?rev=1703896&r1=1703895&r2=1703896&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java Fri Sep 18 16:05:20 2015 @@ -215,8 +215,7 @@ public class Markup break; case Undefined: out.append("<title>"); - out.append(j.qshares); - out.append(" unused shares ("); + out.append("mem avail ("); out.append((j.qshares * j.quantum)); out.append("GB) on "); out.append(h.name); Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java?rev=1703896&r1=1703895&r2=1703896&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java Fri Sep 18 16:05:20 2015 @@ -146,15 +146,8 @@ public class NodeViz NodeConfiguration nc = new NodeConfiguration(class_definitions, null, user_registry, logger); // UIMA-4142 make the config global try { nc.readConfiguration(); - } catch (FileNotFoundException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IllegalConfigurationException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + } catch (Exception e ) { + logger.error(methodName, null, "Cannot read node configuration. Some information may not be quite right."); } // first step, generate the viz from the OR map which seems to have everything we need @@ -202,7 +195,7 @@ public class NodeViz // but punt and try not to crash. logger.warn(methodName, null, "Cannot find scheduling class or quantum for " + sclass + ". Using default quantum of " + default_quantum); } - int qshares = jobmem / quantum; + int qshares = jobmem / quantum; if ( jobmem % quantum != 0 ) qshares++; switch ( type ) { @@ -323,7 +316,6 @@ public class NodeViz String page = markup.close(); int unoccupied_gb = total_gb - (job_gb + pop_gb + service_gb + reservation_gb); - int total_shares = job_shares + pop_shares + service_shares + reservation_shares; visualization = "<html>" + @@ -333,21 +325,14 @@ public class NodeViz "<i onclick=\"ducc_viz_node_sorter('size')\" id=\"ducc-viz-sort-size\" style=\"color:red\">Size </i>" + "<i onclick=\"ducc_viz_node_sorter('name')\" id=\"ducc-viz-sort-name\"\">Name</i>" + "</br>" + - "<b>Total shares: </b>" + total_shares + - ", <b>Jobs: </b>" + job_shares + - ", <b>Services: </b>" + service_shares + - ", <b>Managed Reservations: </b>" + pop_shares + - ", <b>Reservations: </b>" + reservation_shares + - ", <b>Unoccupied: </b>" + unoccupied_gb + - "<br><i><small>" + - "<b>RAM Total:</b> " + total_gb + - "GB, <b>Jobs:</b> " + (job_gb) + - "GB, <b>Services:</b> " + (service_gb) + - "GB, <b>Managed Reservations:</b> " + (pop_gb) + - "GB, <b>Reservations:</b> " + (pop_gb) + - "GB, <b>Unoccupied:</b> " + (unoccupied_gb) + - "GB</small></i>" + - "</div>" + + "<b>Memory Available:</b> " + total_gb + + "GB, <b>In use: </b>" + + "<b><i>Jobs:</i></b> " + (job_gb) + + "GB, <b><i>Services:</i></b> " + (service_gb) + + "GB, <b><i>Managed Reservations:</i></b> " + (pop_gb) + + "GB, <b><i>Reservations:</i></b> " + (reservation_gb) + + "GB, <b><i>Unoccupied:</i></b> " + (unoccupied_gb) + + "GB</div>" + "<br>" + //"<div id=\"nodelist\" style=\"background-color:e5e5e5\">" + "<div id=\"nodelist\" style=\"background-color:eeeeee;padding:3\">" + Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java?rev=1703896&r1=1703895&r2=1703896&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java Fri Sep 18 16:05:20 2015 @@ -79,7 +79,7 @@ class VisualizedHost //TODO String ns = ""; - if ( ns == "" || ns == null ) { + if ( false && ns == "" || ns == null ) { this.mem = 0; this.shares = 0; this.mem_reservable = 0; @@ -169,7 +169,7 @@ class VisualizedHost Collections.sort(fragments, sorter); float height_one_share = (float) Math.sqrt(shares * quantum) / shares; float foo = (float) Math.sqrt(mem) / shares; - logger.debug(methodName, null, name, "shares", shares, "height-one-share", height_one_share, "foo", foo); + logger.debug(methodName, null, name, "avail", (shares*quantum), "height-one-share", height_one_share, "foo", foo); float top = 0f + TITLE_ADJUSTMENT; // the top of the box logger.debug(methodName, null, name, "Draw", fragments.size(), "rectangles, box size", size, "share height", height_one_share);