<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15759] CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tools/dashtime.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15759">15759</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-12 19:17:02 -0700 (Tue, 12 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle missing keys.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobcalendarservertoolsdashtimepy">CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tools/dashtime.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboobetternextjobcalendarservertoolsdashtimepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tools/dashtime.py (15758 => 15759)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tools/dashtime.py 2016-07-13 02:15:49 UTC (rev 15758)
+++ CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tools/dashtime.py 2016-07-13 02:17:02 UTC (rev 15759)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats_system"]["cpu use"] for onehost in hosts])
</del><ins>+ return sum([stats[onehost]["stats_system"]["cpu use"] if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats_system"]["memory percent"] for onehost in hosts])
</del><ins>+ return sum([stats[onehost]["stats_system"]["memory percent"] if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats"]["1m"]["requests"] for onehost in hosts]) / 60.0
</del><ins>+ return sum([stats[onehost]["stats"]["1m"]["requests"] if stats[onehost] else 0 for onehost in hosts]) / 60.0
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -227,8 +227,8 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- tsum = sum([stats[onehost]["stats"]["1m"]["t"] for onehost in hosts])
- rsum = sum([stats[onehost]["stats"]["1m"]["requests"] for onehost in hosts])
</del><ins>+ tsum = sum([stats[onehost]["stats"]["1m"]["t"] if stats[onehost] else 0 for onehost in hosts])
+ rsum = sum([stats[onehost]["stats"]["1m"]["requests"] if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx"> return safeDivision(tsum, rsum)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats"]["1m"]["500"] for onehost in hosts]) / 60.0
</del><ins>+ return sum([stats[onehost]["stats"]["1m"]["500"] if stats[onehost] else 0 for onehost in hosts]) / 60.0
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats"]["1m"]["401"] for onehost in hosts]) / 60.0
</del><ins>+ return sum([stats[onehost]["stats"]["1m"]["401"] if stats[onehost] else 0 for onehost in hosts]) / 60.0
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats"]["1m"]["max-slots"] for onehost in hosts])
</del><ins>+ return sum([stats[onehost]["stats"]["1m"]["max-slots"] if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> def calculate(stats, item, hosts):
</span><span class="cx"> result = 0
</span><span class="cx"> for onehost in hosts:
</span><del>- completed = sum(map(operator.itemgetter(2), stats[onehost]["job_assignments"]["workers"]))
</del><ins>+ completed = sum(map(operator.itemgetter(2), stats[onehost]["job_assignments"]["workers"])) if stats[onehost] else 0
</ins><span class="cx"> delta = completed - JobsCompletedDataType.lastCompleted[onehost] if JobsCompletedDataType.lastCompleted[onehost] else 0
</span><span class="cx"> if delta >= 0:
</span><span class="cx"> result += delta
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- return sum([stats[onehost]["stats"]["1m"]["method"].get(item, 0) for onehost in hosts])
</del><ins>+ return sum([stats[onehost]["stats"]["1m"]["method"].get(item, 0) if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -383,8 +383,8 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calculate(stats, item, hosts):
</span><del>- tsum = sum([stats[onehost]["stats"]["1m"]["method-t"].get(item, 0) for onehost in hosts])
- rsum = sum([stats[onehost]["stats"]["1m"]["method"].get(item, 0) for onehost in hosts])
</del><ins>+ tsum = sum([stats[onehost]["stats"]["1m"]["method-t"].get(item, 0) if stats[onehost] else 0 for onehost in hosts])
+ rsum = sum([stats[onehost]["stats"]["1m"]["method"].get(item, 0) if stats[onehost] else 0 for onehost in hosts])
</ins><span class="cx"> return safeDivision(tsum, rsum)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -411,7 +411,8 @@
</span><span class="cx"> def calculate(stats, item, hosts):
</span><span class="cx"> # Job queue stat only read for first host
</span><span class="cx"> onehost = sorted(stats.keys())[0]
</span><del>-
</del><ins>+ if len(stats[onehost]) == 0:
+ return 0
</ins><span class="cx"> if item:
</span><span class="cx"> return sum(map(operator.itemgetter("queued"), {k: v for k, v in stats[onehost]["jobs"].items() if k.startswith(item)}.values()))
</span><span class="cx"> else:
</span></span></pre>
</div>
</div>
</body>
</html>