X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Fweb%2Fstatus.py;h=d76ebfd7d010c0792c3e15e96ff4c02004513363;hb=67af736db1ddf2f9f60f3aee43cb74c3ecc40502;hp=9f508813d9ecaa90e0af9445450abee08b60427c;hpb=6e3396fb88c7137037c3fcd497239d72450a2247;p=tahoe-lafs%2Ftahoe-lafs.git diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index 9f508813..d76ebfd7 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -1,23 +1,14 @@ -import time, pprint, itertools +import pprint, itertools import simplejson from twisted.internet import defer from nevow import rend, inevow, tags as T from allmydata.util import base32, idlib -from allmydata.web.common import IClient, getxmlfile, abbreviate_time, \ - abbreviate_rate, abbreviate_size, get_arg +from allmydata.web.common import getxmlfile, get_arg, \ + abbreviate_time, abbreviate_rate, abbreviate_size, plural, compute_rate, render_time from allmydata.interfaces import IUploadStatus, IDownloadStatus, \ IPublishStatus, IRetrieveStatus, IServermapUpdaterStatus -def plural(sequence_or_length): - if isinstance(sequence_or_length, int): - length = sequence_or_length - else: - length = len(sequence_or_length) - if length == 1: - return "" - return "s" - class RateAndTimeMixin: def render_time(self, ctx, data): @@ -31,55 +22,51 @@ class UploadResultsRendererMixin(RateAndTimeMixin): def render_pushed_shares(self, ctx, data): d = self.upload_results() - d.addCallback(lambda res: res.pushed_shares) + d.addCallback(lambda res: res.get_pushed_shares()) return d def render_preexisting_shares(self, ctx, data): d = self.upload_results() - d.addCallback(lambda res: res.preexisting_shares) + d.addCallback(lambda res: res.get_preexisting_shares()) return d def render_sharemap(self, ctx, data): d = self.upload_results() - d.addCallback(lambda res: res.sharemap) + d.addCallback(lambda res: res.get_sharemap()) def _render(sharemap): if sharemap is None: return "None" l = T.ul() - for shnum, peerids in sorted(sharemap.items()): - for peerid in peerids: - peerid_s = idlib.shortnodeid_b2a(peerid) - l[T.li["%d -> %s" % (shnum, peerid_s)]] + for shnum, servers in sorted(sharemap.items()): + server_names = ', '.join([s.get_name() for s in servers]) + l[T.li["%d -> placed on [%s]" % (shnum, server_names)]] return l d.addCallback(_render) return d def render_servermap(self, ctx, data): d = self.upload_results() - d.addCallback(lambda res: res.servermap) + d.addCallback(lambda res: res.get_servermap()) def _render(servermap): if servermap is None: return "None" l = T.ul() - for peerid in sorted(servermap.keys()): - peerid_s = idlib.shortnodeid_b2a(peerid) - shares_s = ",".join(["#%d" % shnum - for shnum in servermap[peerid]]) - l[T.li["[%s] got share%s: %s" % (peerid_s, - plural(servermap[peerid]), - shares_s)]] + for server, shnums in sorted(servermap.items()): + shares_s = ",".join(["#%d" % shnum for shnum in shnums]) + l[T.li["[%s] got share%s: %s" % (server.get_name(), + plural(shnums), shares_s)]] return l d.addCallback(_render) return d def data_file_size(self, ctx, data): d = self.upload_results() - d.addCallback(lambda res: res.file_size) + d.addCallback(lambda res: res.get_file_size()) return d def _get_time(self, name): d = self.upload_results() - d.addCallback(lambda res: res.timings.get(name)) + d.addCallback(lambda res: res.get_timings().get(name)) return d def data_time_total(self, ctx, data): @@ -91,9 +78,6 @@ class UploadResultsRendererMixin(RateAndTimeMixin): def data_time_contacting_helper(self, ctx, data): return self._get_time("contacting_helper") - def data_time_existence_check(self, ctx, data): - return self._get_time("existence_check") - def data_time_cumulative_fetch(self, ctx, data): return self._get_time("cumulative_fetch") @@ -118,14 +102,9 @@ class UploadResultsRendererMixin(RateAndTimeMixin): def _get_rate(self, name): d = self.upload_results() def _convert(r): - file_size = r.file_size - time = r.timings.get(name) - if time is None: - return None - try: - return 1.0 * file_size / time - except ZeroDivisionError: - return None + file_size = r.get_file_size() + duration = r.get_timings().get(name) + return compute_rate(file_size, duration) d.addCallback(_convert) return d @@ -144,29 +123,22 @@ class UploadResultsRendererMixin(RateAndTimeMixin): def data_rate_encode_and_push(self, ctx, data): d = self.upload_results() def _convert(r): - file_size = r.file_size - time1 = r.timings.get("cumulative_encoding") - time2 = r.timings.get("cumulative_sending") - if (file_size is None or time1 is None or time2 is None): - return None - try: - return 1.0 * file_size / (time1+time2) - except ZeroDivisionError: + file_size = r.get_file_size() + time1 = r.get_timings().get("cumulative_encoding") + time2 = r.get_timings().get("cumulative_sending") + if (time1 is None or time2 is None): return None + else: + return compute_rate(file_size, time1+time2) d.addCallback(_convert) return d def data_rate_ciphertext_fetch(self, ctx, data): d = self.upload_results() def _convert(r): - fetch_size = r.ciphertext_fetched - time = r.timings.get("cumulative_fetch") - if (fetch_size is None or time is None): - return None - try: - return 1.0 * fetch_size / time - except ZeroDivisionError: - return None + fetch_size = r.get_ciphertext_fetched() + duration = r.get_timings().get("cumulative_fetch") + return compute_rate(fetch_size, duration) d.addCallback(_convert) return d @@ -190,9 +162,7 @@ class UploadStatusPage(UploadResultsRendererMixin, rend.Page): return d def render_started(self, ctx, data): - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_started())) + started_s = render_time(data.get_started()) return started_s def render_si(self, ctx, data): @@ -317,13 +287,8 @@ class DownloadResultsRendererMixin(RateAndTimeMixin): d = self.download_results() def _convert(r): file_size = r.file_size - time = r.timings.get(name) - if time is None: - return None - try: - return 1.0 * file_size / time - except ZeroDivisionError: - return None + duration = r.timings.get(name) + return compute_rate(file_size, duration) d.addCallback(_convert) return d @@ -365,9 +330,278 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): rend.Page.__init__(self, data) self.download_status = data + def child_timeline(self, ctx): + return DownloadStatusTimelinePage(self.download_status) + def download_results(self): return defer.maybeDeferred(self.download_status.get_results) + def relative_time(self, t): + if t is None: + return t + if self.download_status.first_timestamp is not None: + return t - self.download_status.first_timestamp + return t + def short_relative_time(self, t): + t = self.relative_time(t) + if t is None: + return "" + return "+%.6fs" % t + + def _find_overlap(self, events, start_key, end_key): + # given a list of event dicts, return a new list in which each event + # has an extra "row" key (an int, starting at 0), and if appropriate + # a "serverid" key (ascii-encoded server id), replacing the "server" + # key. This is a hint to our JS frontend about how to overlap the + # parts of the graph it is drawing. + + # we must always make a copy, since we're going to be adding keys + # and don't want to change the original objects. If we're + # stringifying serverids, we'll also be changing the serverid keys. + new_events = [] + rows = [] + for ev in events: + ev = ev.copy() + if ev.has_key('server'): + ev["serverid"] = ev["server"].get_longname() + del ev["server"] + # find an empty slot in the rows + free_slot = None + for row,finished in enumerate(rows): + if finished is not None: + if ev[start_key] > finished: + free_slot = row + break + if free_slot is None: + free_slot = len(rows) + rows.append(ev[end_key]) + else: + rows[free_slot] = ev[end_key] + ev["row"] = free_slot + new_events.append(ev) + return new_events + + def _find_overlap_requests(self, events): + """We compute a three-element 'row tuple' for each event: (serverid, + shnum, row). All elements are ints. The first is a mapping from + serverid to group number, the second is a mapping from shnum to + subgroup number. The third is a row within the subgroup. + + We also return a list of lists of rowcounts, so renderers can decide + how much vertical space to give to each row. + """ + + serverid_to_group = {} + groupnum_to_rows = {} # maps groupnum to a table of rows. Each table + # is a list with an element for each row number + # (int starting from 0) that contains a + # finish_time, indicating that the row is empty + # beyond that time. If finish_time is None, it + # indicate a response that has not yet + # completed, so the row cannot be reused. + new_events = [] + for ev in events: + # DownloadStatus promises to give us events in temporal order + ev = ev.copy() + ev["serverid"] = ev["server"].get_longname() + del ev["server"] + if ev["serverid"] not in serverid_to_group: + groupnum = len(serverid_to_group) + serverid_to_group[ev["serverid"]] = groupnum + groupnum = serverid_to_group[ev["serverid"]] + if groupnum not in groupnum_to_rows: + groupnum_to_rows[groupnum] = [] + rows = groupnum_to_rows[groupnum] + # find an empty slot in the rows + free_slot = None + for row,finished in enumerate(rows): + if finished is not None: + if ev["start_time"] > finished: + free_slot = row + break + if free_slot is None: + free_slot = len(rows) + rows.append(ev["finish_time"]) + else: + rows[free_slot] = ev["finish_time"] + ev["row"] = (groupnum, free_slot) + new_events.append(ev) + del groupnum + # maybe also return serverid_to_group, groupnum_to_rows, and some + # indication of the highest finish_time + # + # actually, return the highest rownum for each groupnum + highest_rownums = [len(groupnum_to_rows[groupnum]) + for groupnum in range(len(serverid_to_group))] + return new_events, highest_rownums + + def child_event_json(self, ctx): + inevow.IRequest(ctx).setHeader("content-type", "text/plain") + data = { } # this will be returned to the GET + ds = self.download_status + + data["misc"] = self._find_overlap(ds.misc_events, + "start_time", "finish_time") + data["read"] = self._find_overlap(ds.read_events, + "start_time", "finish_time") + data["segment"] = self._find_overlap(ds.segment_events, + "start_time", "finish_time") + # TODO: overlap on DYHB isn't very useful, and usually gets in the + # way. So don't do it. + data["dyhb"] = self._find_overlap(ds.dyhb_requests, + "start_time", "finish_time") + data["block"],data["block_rownums"] = self._find_overlap_requests(ds.block_requests) + + server_info = {} # maps longname to {num,color,short} + server_shortnames = {} # maps servernum to shortname + for d_ev in ds.dyhb_requests: + s = d_ev["server"] + longname = s.get_longname() + if longname not in server_info: + num = len(server_info) + server_info[longname] = {"num": num, + "color": self.color(s), + "short": s.get_name() } + server_shortnames[str(num)] = s.get_name() + + data["server_info"] = server_info + data["num_serverids"] = len(server_info) + # we'd prefer the keys of serverids[] to be ints, but this is JSON, + # so they get converted to strings. Stupid javascript. + data["serverids"] = server_shortnames + data["bounds"] = {"min": ds.first_timestamp, "max": ds.last_timestamp} + return simplejson.dumps(data, indent=1) + "\n" + + def render_timeline_link(self, ctx, data): + from nevow import url + return T.a(href=url.URL.fromContext(ctx).child("timeline"))["timeline"] + + def _rate_and_time(self, bytes, seconds): + time_s = self.render_time(None, seconds) + if seconds != 0: + rate = self.render_rate(None, 1.0 * bytes / seconds) + return T.span(title=rate)[time_s] + return T.span[time_s] + + def render_events(self, ctx, data): + if not self.download_status.storage_index: + return + srt = self.short_relative_time + l = T.div() + + t = T.table(align="left", class_="status-download-events") + t[T.tr[T.th["serverid"], T.th["sent"], T.th["received"], + T.th["shnums"], T.th["RTT"]]] + for d_ev in self.download_status.dyhb_requests: + server = d_ev["server"] + sent = d_ev["start_time"] + shnums = d_ev["response_shnums"] + received = d_ev["finish_time"] + rtt = None + if received is not None: + rtt = received - sent + if not shnums: + shnums = ["-"] + t[T.tr(style="background: %s" % self.color(server))[ + [T.td[server.get_name()], T.td[srt(sent)], T.td[srt(received)], + T.td[",".join([str(shnum) for shnum in shnums])], + T.td[self.render_time(None, rtt)], + ]]] + + l[T.h2["DYHB Requests:"], t] + l[T.br(clear="all")] + + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["range"], T.th["start"], T.th["finish"], T.th["got"], + T.th["time"], T.th["decrypttime"], T.th["pausedtime"], + T.th["speed"]]] + for r_ev in self.download_status.read_events: + start = r_ev["start"] + length = r_ev["length"] + bytes = r_ev["bytes_returned"] + decrypt_time = "" + if bytes: + decrypt_time = self._rate_and_time(bytes, r_ev["decrypt_time"]) + speed, rtt = "","" + if r_ev["finish_time"] is not None: + rtt = r_ev["finish_time"] - r_ev["start_time"] - r_ev["paused_time"] + speed = self.render_rate(None, compute_rate(bytes, rtt)) + rtt = self.render_time(None, rtt) + paused = self.render_time(None, r_ev["paused_time"]) + + t[T.tr[T.td["[%d:+%d]" % (start, length)], + T.td[srt(r_ev["start_time"])], T.td[srt(r_ev["finish_time"])], + T.td[bytes], T.td[rtt], + T.td[decrypt_time], T.td[paused], + T.td[speed], + ]] + + l[T.h2["Read Events:"], t] + l[T.br(clear="all")] + + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["segnum"], T.th["start"], T.th["active"], T.th["finish"], + T.th["range"], + T.th["decodetime"], T.th["segtime"], T.th["speed"]]] + for s_ev in self.download_status.segment_events: + range_s = "-" + segtime_s = "-" + speed = "-" + decode_time = "-" + if s_ev["finish_time"] is not None: + if s_ev["success"]: + segtime = s_ev["finish_time"] - s_ev["active_time"] + segtime_s = self.render_time(None, segtime) + seglen = s_ev["segment_length"] + range_s = "[%d:+%d]" % (s_ev["segment_start"], seglen) + speed = self.render_rate(None, compute_rate(seglen, segtime)) + decode_time = self._rate_and_time(seglen, s_ev["decode_time"]) + else: + # error + range_s = "error" + else: + # not finished yet + pass + + t[T.tr[T.td["seg%d" % s_ev["segment_number"]], + T.td[srt(s_ev["start_time"])], + T.td[srt(s_ev["active_time"])], + T.td[srt(s_ev["finish_time"])], + T.td[range_s], + T.td[decode_time], + T.td[segtime_s], T.td[speed]]] + + l[T.h2["Segment Events:"], t] + l[T.br(clear="all")] + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["serverid"], T.th["shnum"], T.th["range"], + T.th["txtime"], T.th["rxtime"], + T.th["received"], T.th["RTT"]]] + for r_ev in self.download_status.block_requests: + server = r_ev["server"] + rtt = None + if r_ev["finish_time"] is not None: + rtt = r_ev["finish_time"] - r_ev["start_time"] + color = self.color(server) + t[T.tr(style="background: %s" % color)[ + T.td[server.get_name()], T.td[r_ev["shnum"]], + T.td["[%d:+%d]" % (r_ev["start"], r_ev["length"])], + T.td[srt(r_ev["start_time"])], T.td[srt(r_ev["finish_time"])], + T.td[r_ev["response_length"] or ""], + T.td[self.render_time(None, rtt)], + ]] + + l[T.h2["Requests:"], t] + l[T.br(clear="all")] + + return l + + def color(self, server): + peerid = server.get_serverid() # binary + def m(c): + return min(ord(c) / 2 + 0x80, 0xff) + return "#%02x%02x%02x" % (m(peerid[0]), m(peerid[1]), m(peerid[2])) + def render_results(self, ctx, data): d = self.download_results() def _got_results(results): @@ -378,10 +612,39 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): return d def render_started(self, ctx, data): - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_started())) - return started_s + started_s = render_time(data.get_started()) + return started_s + " (%s)" % data.get_started() + + def render_si(self, ctx, data): + si_s = base32.b2a_or_none(data.get_storage_index()) + if si_s is None: + si_s = "(None)" + return si_s + + def render_helper(self, ctx, data): + return {True: "Yes", + False: "No"}[data.using_helper()] + + def render_total_size(self, ctx, data): + size = data.get_size() + if size is None: + return "(unknown)" + return size + + def render_progress(self, ctx, data): + progress = data.get_progress() + # TODO: make an ascii-art bar + return "%.1f%%" % (100.0 * progress) + + def render_status(self, ctx, data): + return data.get_status() + +class DownloadStatusTimelinePage(rend.Page): + docFactory = getxmlfile("download-status-timeline.xhtml") + + def render_started(self, ctx, data): + started_s = render_time(data.get_started()) + return started_s + " (%s)" % data.get_started() def render_si(self, ctx, data): si_s = base32.b2a_or_none(data.get_storage_index()) @@ -415,9 +678,7 @@ class RetrieveStatusPage(rend.Page, RateAndTimeMixin): self.retrieve_status = data def render_started(self, ctx, data): - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_started())) + started_s = render_time(data.get_started()) return started_s def render_si(self, ctx, data): @@ -449,7 +710,7 @@ class RetrieveStatusPage(rend.Page, RateAndTimeMixin): return ctx.tag["Encoding: %s of %s" % (k, n)] def render_problems(self, ctx, data): - problems = data.problems + problems = data.get_problems() if not problems: return "" l = T.ul() @@ -460,13 +721,8 @@ class RetrieveStatusPage(rend.Page, RateAndTimeMixin): def _get_rate(self, data, name): file_size = self.retrieve_status.get_size() - time = self.retrieve_status.timings.get(name) - if time is None or file_size is None: - return None - try: - return 1.0 * file_size / time - except ZeroDivisionError: - return None + duration = self.retrieve_status.timings.get(name) + return compute_rate(file_size, duration) def data_time_total(self, ctx, data): return self.retrieve_status.timings.get("total") @@ -493,11 +749,10 @@ class RetrieveStatusPage(rend.Page, RateAndTimeMixin): if not per_server: return "" l = T.ul() - for peerid in sorted(per_server.keys()): - peerid_s = idlib.shortnodeid_b2a(peerid) + for server in sorted(per_server.keys(), key=lambda s: s.get_name()): times_s = ", ".join([self.render_time(None, t) - for t in per_server[peerid]]) - l[T.li["[%s]: %s" % (peerid_s, times_s)]] + for t in per_server[server]]) + l[T.li["[%s]: %s" % (server.get_name(), times_s)]] return T.li["Per-Server Fetch Response Times: ", l] @@ -509,9 +764,7 @@ class PublishStatusPage(rend.Page, RateAndTimeMixin): self.publish_status = data def render_started(self, ctx, data): - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_started())) + started_s = render_time(data.get_started()) return started_s def render_si(self, ctx, data): @@ -550,15 +803,17 @@ class PublishStatusPage(rend.Page, RateAndTimeMixin): sharemap = servermap.make_sharemap() for shnum in sorted(sharemap.keys()): l[T.li["%d -> Placed on " % shnum, - ", ".join(["[%s]" % idlib.shortnodeid_b2a(peerid) - for peerid in sharemap[shnum]])]] + ", ".join(["[%s]" % server.get_name() + for server in sharemap[shnum]])]] return ctx.tag["Sharemap:", l] def render_problems(self, ctx, data): - problems = data.problems + problems = data.get_problems() if not problems: return "" l = T.ul() + # XXX: is this exercised? I don't think PublishStatus.problems is + # ever populated for peerid in sorted(problems.keys()): peerid_s = idlib.shortnodeid_b2a(peerid) l[T.li["[%s]: %s" % (peerid_s, problems[peerid])]] @@ -566,13 +821,8 @@ class PublishStatusPage(rend.Page, RateAndTimeMixin): def _get_rate(self, data, name): file_size = self.publish_status.get_size() - time = self.publish_status.timings.get(name) - if time is None: - return None - try: - return 1.0 * file_size / time - except ZeroDivisionError: - return None + duration = self.publish_status.timings.get(name) + return compute_rate(file_size, duration) def data_time_total(self, ctx, data): return self.publish_status.timings.get("total") @@ -609,11 +859,10 @@ class PublishStatusPage(rend.Page, RateAndTimeMixin): if not per_server: return "" l = T.ul() - for peerid in sorted(per_server.keys()): - peerid_s = idlib.shortnodeid_b2a(peerid) + for server in sorted(per_server.keys(), key=lambda s: s.get_name()): times_s = ", ".join([self.render_time(None, t) - for t in per_server[peerid]]) - l[T.li["[%s]: %s" % (peerid_s, times_s)]] + for t in per_server[server]]) + l[T.li["[%s]: %s" % (server.get_name(), times_s)]] return T.li["Per-Server Response Times: ", l] class MapupdateStatusPage(rend.Page, RateAndTimeMixin): @@ -624,18 +873,14 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): self.update_status = data def render_started(self, ctx, data): - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_started())) + started_s = render_time(data.get_started()) return started_s def render_finished(self, ctx, data): when = data.get_finished() if not when: return "not yet" - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(data.get_finished())) + started_s = render_time(data.get_finished()) return started_s def render_si(self, ctx, data): @@ -667,10 +912,9 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): return ctx.tag["Server Problems:", l] def render_privkey_from(self, ctx, data): - peerid = data.get_privkey_from() - if peerid: - return ctx.tag["Got privkey from: [%s]" - % idlib.shortnodeid_b2a(peerid)] + server = data.get_privkey_from() + if server: + return ctx.tag["Got privkey from: [%s]" % server.get_name()] else: return "" @@ -688,10 +932,9 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): if not per_server: return "" l = T.ul() - for peerid in sorted(per_server.keys()): - peerid_s = idlib.shortnodeid_b2a(peerid) + for server in sorted(per_server.keys(), key=lambda s: s.get_name()): times = [] - for op,started,t in per_server[peerid]: + for op,started,t in per_server[server]: #times.append("%s/%.4fs/%s/%s" % (op, # started, # self.render_time(None, started - self.update_status.get_started()), @@ -703,7 +946,7 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): else: times.append( "privkey(" + self.render_time(None, t) + ")" ) times_s = ", ".join(times) - l[T.li["[%s]: %s" % (peerid_s, times_s)]] + l[T.li["[%s]: %s" % (server.get_name(), times_s)]] return T.li["Per-Server Response Times: ", l] def render_timing_chart(self, ctx, data): @@ -714,24 +957,29 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): started = self.update_status.get_started() total = self.update_status.timings.get("total") per_server = self.update_status.timings.get("per_server") + # We'd like to use an https: URL here, but the site has a domain/cert mismatch. base = "http://chart.apis.google.com/chart?" - pieces = ["cht=bhs", "chs=400x300"] + pieces = ["cht=bhs"] pieces.append("chco=ffffff,4d89f9,c6d9fd") # colors data0 = [] data1 = [] data2 = [] - peerids_s = [] + nb_nodes = 0 + graph_botom_margin= 21 + graph_top_margin = 5 + server_names = [] top_abs = started # we sort the queries by the time at which we sent the first request - sorttable = [ (times[0][1], peerid) - for peerid, times in per_server.items() ] + sorttable = [ (times[0][1], server) + for server, times in per_server.items() ] sorttable.sort() - peerids = [t[1] for t in sorttable] + servers = [t[1] for t in sorttable] - for peerid in peerids: - times = per_server[peerid] - peerid_s = idlib.shortnodeid_b2a(peerid) - peerids_s.append(peerid_s) + for server in servers: + nb_nodes += 1 + times = per_server[server] + name = server.get_name() + server_names.append(name) # for servermap updates, there are either one or two queries per # peer. The second (if present) is to get the privkey. op,q_started,q_elapsed = times[0] @@ -748,15 +996,17 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): if finished: top_abs = max(top_abs, finished) top_rel = top_abs - started + chs ="chs=400x%d" % ( (nb_nodes*28) + graph_top_margin + graph_botom_margin ) chd = "chd=t:" + "|".join([",".join(data0), ",".join(data1), ",".join(data2)]) pieces.append(chd) + pieces.append(chs) chds = "chds=0,%0.3f" % top_rel pieces.append(chds) pieces.append("chxt=x,y") pieces.append("chxr=0,0.0,%0.3f" % top_rel) - pieces.append("chxl=1:|" + "|".join(reversed(peerids_s))) + pieces.append("chxl=1:|" + "|".join(reversed(server_names))) # use up to 10 grid lines, at decimal multiples. # mathutil.next_power_of_k doesn't handle numbers smaller than one, # unfortunately. @@ -767,25 +1017,29 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): pieces.append("chm=r,FF0000,0,%0.3f,%0.3f" % (finished_f, finished_f+0.01)) url = base + "&".join(pieces) - return T.img(src=url, align="right", float="right") + return T.img(src=url,border="1",align="right", float="right") class Status(rend.Page): docFactory = getxmlfile("status.xhtml") addSlash = True + def __init__(self, history): + rend.Page.__init__(self, history) + self.history = history + def renderHTTP(self, ctx): - t = get_arg(inevow.IRequest(ctx), "t") + req = inevow.IRequest(ctx) + t = get_arg(req, "t") if t == "json": - return self.json(ctx) + return self.json(req) return rend.Page.renderHTTP(self, ctx) - def json(self, ctx): - inevow.IRequest(ctx).setHeader("content-type", "text/plain") - client = IClient(ctx) + def json(self, req): + req.setHeader("content-type", "text/plain") data = {} data["active"] = active = [] - for s in self.data_active_operations(ctx, None): + for s in self._get_active_operations(): si_s = base32.b2a_or_none(s.get_storage_index()) size = s.get_size() status = s.get_status() @@ -809,26 +1063,31 @@ class Status(rend.Page): return simplejson.dumps(data, indent=1) + "\n" - def _get_all_statuses(self, client): - return itertools.chain(client.list_all_upload_statuses(), - client.list_all_download_statuses(), - client.list_all_mapupdate_statuses(), - client.list_all_publish_statuses(), - client.list_all_retrieve_statuses(), - client.list_all_helper_statuses(), + def _get_all_statuses(self): + h = self.history + return itertools.chain(h.list_all_upload_statuses(), + h.list_all_download_statuses(), + h.list_all_mapupdate_statuses(), + h.list_all_publish_statuses(), + h.list_all_retrieve_statuses(), + h.list_all_helper_statuses(), ) def data_active_operations(self, ctx, data): - client = IClient(ctx) + return self._get_active_operations() + + def _get_active_operations(self): active = [s - for s in self._get_all_statuses(client) + for s in self._get_all_statuses() if s.get_active()] return active def data_recent_operations(self, ctx, data): - client = IClient(ctx) + return self._get_recent_operations() + + def _get_recent_operations(self): recent = [s - for s in self._get_all_statuses(client) + for s in self._get_all_statuses() if not s.get_active()] recent.sort(lambda a,b: cmp(a.get_started(), b.get_started())) recent.reverse() @@ -837,9 +1096,7 @@ class Status(rend.Page): def render_row(self, ctx, data): s = data - TIME_FORMAT = "%H:%M:%S %d-%b-%Y" - started_s = time.strftime(TIME_FORMAT, - time.localtime(s.get_started())) + started_s = render_time(s.get_started()) ctx.fillSlots("started", started_s) si_s = base32.b2a_or_none(s.get_storage_index()) @@ -888,30 +1145,30 @@ class Status(rend.Page): return ctx.tag def childFactory(self, ctx, name): - client = IClient(ctx) + h = self.history stype,count_s = name.split("-") count = int(count_s) if stype == "up": - for s in itertools.chain(client.list_all_upload_statuses(), - client.list_all_helper_statuses()): + for s in itertools.chain(h.list_all_upload_statuses(), + h.list_all_helper_statuses()): # immutable-upload helpers use the same status object as a # regular immutable-upload if s.get_counter() == count: return UploadStatusPage(s) if stype == "down": - for s in client.list_all_download_statuses(): + for s in h.list_all_download_statuses(): if s.get_counter() == count: return DownloadStatusPage(s) if stype == "mapupdate": - for s in client.list_all_mapupdate_statuses(): + for s in h.list_all_mapupdate_statuses(): if s.get_counter() == count: return MapupdateStatusPage(s) if stype == "publish": - for s in client.list_all_publish_statuses(): + for s in h.list_all_publish_statuses(): if s.get_counter() == count: return PublishStatusPage(s) if stype == "retrieve": - for s in client.list_all_retrieve_statuses(): + for s in h.list_all_retrieve_statuses(): if s.get_counter() == count: return RetrieveStatusPage(s) @@ -919,24 +1176,26 @@ class Status(rend.Page): class HelperStatus(rend.Page): docFactory = getxmlfile("helper.xhtml") + def __init__(self, helper): + rend.Page.__init__(self, helper) + self.helper = helper + def renderHTTP(self, ctx): - t = get_arg(inevow.IRequest(ctx), "t") + req = inevow.IRequest(ctx) + t = get_arg(req, "t") if t == "json": - return self.render_JSON(ctx) - # is there a better way to provide 'data' to all rendering methods? - helper = IClient(ctx).getServiceNamed("helper") - self.original = helper.get_stats() + return self.render_JSON(req) return rend.Page.renderHTTP(self, ctx) - def render_JSON(self, ctx): - inevow.IRequest(ctx).setHeader("content-type", "text/plain") - try: - h = IClient(ctx).getServiceNamed("helper") - except KeyError: - return simplejson.dumps({}) + "\n" + def data_helper_stats(self, ctx, data): + return self.helper.get_stats() - stats = h.get_stats() - return simplejson.dumps(stats, indent=1) + "\n" + def render_JSON(self, req): + req.setHeader("content-type", "text/plain") + if self.helper: + stats = self.helper.get_stats() + return simplejson.dumps(stats, indent=1) + "\n" + return simplejson.dumps({}) + "\n" def render_active_uploads(self, ctx, data): return data["chk_upload_helper.active_uploads"] @@ -968,19 +1227,22 @@ class HelperStatus(rend.Page): class Statistics(rend.Page): docFactory = getxmlfile("statistics.xhtml") + def __init__(self, provider): + rend.Page.__init__(self, provider) + self.provider = provider + def renderHTTP(self, ctx): - provider = IClient(ctx).stats_provider - stats = {'stats': {}, 'counters': {}} - if provider: - stats = provider.get_stats() - t = get_arg(inevow.IRequest(ctx), "t") + req = inevow.IRequest(ctx) + t = get_arg(req, "t") if t == "json": - inevow.IRequest(ctx).setHeader("content-type", "text/plain") + stats = self.provider.get_stats() + req.setHeader("content-type", "text/plain") return simplejson.dumps(stats, indent=1) + "\n" - # is there a better way to provide 'data' to all rendering methods? - self.original = stats return rend.Page.renderHTTP(self, ctx) + def data_get_stats(self, ctx, data): + return self.provider.get_stats() + def render_load_average(self, ctx, data): return str(data["stats"].get("load_monitor.avg_load")) @@ -1011,6 +1273,23 @@ class Statistics(rend.Page): return "%s files / %s bytes (%s)" % (files, bytes, abbreviate_size(bytes)) + def render_drop_monitored(self, ctx, data): + dirs = data["counters"].get("drop_upload.dirs_monitored", 0) + return "%s directories" % (dirs,) + + def render_drop_uploads(self, ctx, data): + # TODO: bytes uploaded + files = data["counters"].get("drop_upload.files_uploaded", 0) + return "%s files" % (files,) + + def render_drop_queued(self, ctx, data): + files = data["counters"].get("drop_upload.files_queued", 0) + return "%s files" % (files,) + + def render_drop_failed(self, ctx, data): + files = data["counters"].get("drop_upload.files_failed", 0) + return "%s files" % (files,) + def render_raw(self, ctx, data): raw = pprint.pformat(data) return ctx.tag[raw]