<!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>[15621] CalendarServer/trunk/calendarserver/tools</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/15621">15621</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 08:02:50 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better error handling.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashcollectpy">CalendarServer/trunk/calendarserver/tools/dashcollect.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdashviewpy">CalendarServer/trunk/calendarserver/tools/dashview.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashcollectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashcollect.py (15620 => 15621)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-20 00:27:35 UTC (rev 15620)
+++ CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-20 15:02:50 UTC (rev 15621)
</span><span class="lines">@@ -113,11 +113,18 @@
</span><span class="cx"> host[1] = int(host[1])
</span><span class="cx"> host = tuple(host)
</span><span class="cx">
</span><del>- server = CollectorService(host, CollectorRequestHandler)
- server.dashboard = dash
- server_thread = Thread(target=server.serve_forever)
- server_thread.daemon = True
- server_thread.start()
</del><ins>+ try:
+ server = CollectorService(host, CollectorRequestHandler)
+ server.dashboard = dash
+ server_thread = Thread(target=server.serve_forever)
+ server_thread.daemon = True
+ server_thread.start()
+ except Exception as e:
+ print("Terminating service due to error: {}".format(e))
+ dash.stop()
+ server.shutdown()
+ server_thread.join()
+ sys.exit(1)
</ins><span class="cx">
</span><span class="cx"> while dash_thread.isAlive():
</span><span class="cx"> try:
</span><span class="lines">@@ -126,6 +133,7 @@
</span><span class="cx"> print("Terminating service")
</span><span class="cx"> dash.stop()
</span><span class="cx"> server.shutdown()
</span><ins>+ server_thread.join()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -266,11 +274,11 @@
</span><span class="cx"> self.socket.connect(self.sockname)
</span><span class="cx"> self.socket.setblocking(0)
</span><span class="cx"> self.socket.sendall(json.dumps(items) + "\r\n")
</span><del>- except socket.error:
</del><ins>+ except socket.error as e:
</ins><span class="cx"> self.socket = None
</span><del>- _verbose(" server failed: {}".format(self.host))
- except ValueError:
- pass
</del><ins>+ _verbose(" server failed: {} {}".format(self.host, e))
+ except ValueError as e:
+ _verbose(" server failed: {} {}".format(self.host, e))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def readSock(self, items):
</span><span class="lines">@@ -286,7 +294,7 @@
</span><span class="cx"> try:
</span><span class="cx"> d = self.socket.recv(1024)
</span><span class="cx"> except socket.error as se:
</span><del>- if se.args[0] != errno.EWOULDBLOCK:
</del><ins>+ if se.args[0] not in (errno.EWOULDBLOCK, errno.EAGAIN):
</ins><span class="cx"> raise
</span><span class="cx"> if time.time() - t > 5:
</span><span class="cx"> raise socket.error
</span><span class="lines">@@ -296,11 +304,13 @@
</span><span class="cx"> else:
</span><span class="cx"> break
</span><span class="cx"> data = json.loads(data, object_pairs_hook=OrderedDict)
</span><del>- except socket.error:
</del><ins>+ except socket.error as e:
</ins><span class="cx"> data = {}
</span><span class="cx"> self.socket = None
</span><del>- except ValueError:
</del><ins>+ _verbose(" server failed: {} {}".format(self.host, e))
+ except ValueError as e:
</ins><span class="cx"> data = {}
</span><ins>+ _verbose(" server failed: {} {}".format(self.host, e))
</ins><span class="cx"> return data
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -312,7 +322,7 @@
</span><span class="cx"> # Only read each item once
</span><span class="cx"> self.currentData = self.readSock(list(set(self.items)))
</span><span class="cx"> data[self.host] = self.currentData
</span><del>- _verbose(" Server read: {}".format(self.host))
</del><ins>+ _verbose(" Server read: {} {}".format(self.host, len(data[self.host])))
</ins><span class="cx"> #_verbose(" Data: {}".format(self.currentData))
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdashviewpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashview.py (15620 => 15621)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashview.py 2016-05-20 00:27:35 UTC (rev 15620)
+++ CalendarServer/trunk/calendarserver/tools/dashview.py 2016-05-20 15:02:50 UTC (rev 15621)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> import termios
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-
</del><span class="cx"> LOG_FILENAME = "db.log"
</span><span class="cx"> logging.basicConfig(filename=LOG_FILENAME, level=logging.DEBUG)
</span><span class="cx">
</span><span class="lines">@@ -404,7 +403,7 @@
</span><span class="cx"> # jobs are only requested from the first server in a pod because otherwise
</span><span class="cx"> # it would be too expensive to run the DB query for all servers. So when we
</span><span class="cx"> # need the jobs data, always substitute the first server's data
</span><del>- if item == "jobs":
</del><ins>+ if item in ("jobs", "jobcount"):
</ins><span class="cx"> server = self.currentData["pods"][pod].keys()[0]
</span><span class="cx">
</span><span class="cx"> return self.currentData["pods"][pod][server].get(item)
</span><span class="lines">@@ -798,7 +797,7 @@
</span><span class="cx"> safeDivision(stat["t"] - stat["t-resp-wr"], stat["requests"]),
</span><span class="cx"> stat["T-MAX"],
</span><span class="cx"> safeDivision(float(stat["slots"]), stat["requests"]),
</span><del>- stat["max-slots"],
</del><ins>+ stat.get("max-slots", 0),
</ins><span class="cx"> safeDivision(stat["cpu"], stat["requests"]),
</span><span class="cx"> stat["500"],
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>