AllMyData - Tahoe - Check Results

Welcome To AllMyData "Tahoe"!

**20090503203142 Ignore-this: 5c50af241c1a958b5180ef2b6a49f626 ] hunk ./src/allmydata/web/tahoe.css 9 padding: .25em; overflow: auto; } + +/* ----------------------------------------------------------------------- */ + +/* colors borrowed from the Allmydata logo */ + +/* general style */ +h1 { + text-align: center; +} +table { + margin: 1em auto; + border: .2em solid #3289b4; + border-spacing: 1px; +} +th { + color: white; + background-color: #58a1c3; +} +td { padding: .3em .3em; } +th { padding: .3em .3em; } +.table-headings-top th { text-align: center; } +.table-headings-left th { text-align: right; vertical-align: top; } +legend { + font-weight: bold; +} + +.connected-yes, .connected-True { + border: 1px solid #75d24a; + background-color: #EFE; +} +.connected-no, .connected-False { + border: 1px solid #F00; + background-color: #FBB; +} + +.encoded, .nodeid { + font-family: monospace; + font-size: 80%; +} + +.empty-marker { + background-color: white; + color: gray; +} +table td.empty-marker { + padding: 6em 10em; + text-align: center; + vertical-align: center; +} + +/* styles for server listings in tables (nickname above nodeid) */ +th.nickname-and-peerid { + text-align: left; +} +.nickname { + font: inherit; + font-family: sans-serif; + font-weight: bold; +} + + +/* just in case, make sure floats don't stomp on big tables etc. */ +#section { clear: both; } + +/* section-specific styles - turn this client info into a sidebar */ +#this-client { + font-size: 60%; + border: .2em solid #3289b4; + float: right; + width: 40%; + margin: 0 0 .5em .5em; + padding: 3px; +} +#this-client .nodeid { font-size: inherit; } +#this-client h2 { + text-align: center; + background: #3289b4; + color: white; + margin: -2px -2px 0 -2px; /* matches padding */ + padding: .3em; +} +#this-client table { + font-size: inherit; + margin: 0 -3px -3px -3px; /* matches padding */ +} +#this-client td > ul { + list-style-type: outside; + margin: 0 0 0 2.3em; + padding-left: 0; +} + + +/* services table */ +.services { +} + +/* --- Directory page styles --- */ + +body.tahoe-directory-page { + color: black; + background: #c0d9e6; + margin: 1em 0; /* zero margin so the table can be flush */ +} +table.tahoe-directory { + color: black; + background: white; + width: 100%; + /*border-left-color: #D7E0E5; + border-right-color: #D7E0E5;*/ + border-left: 0; + border-right: 0; +} +.tahoe-directory-footer { + color: black; + background: #c0d9e6; + margin: 0 1em; /* compensate for page 0 margin */ +} + +/* directory-screen toolbar */ +.toolbar { + display: table; + margin: .2em auto; + /*width: 100%;*/ +} +.toolbar .toolbar-item { + display: table-cell; + text-align: center; + padding: 0 1em; +} [Comment on duplication of code/markup found during styling project. Kevin Reid **20090503203442 Ignore-this: a4b7f9f0ab57d2c03be9ba761be8d854 ] { hunk ./src/allmydata/web/check_results.py 112 sharemap = [] servers = {} + # FIXME: The two tables below contain nickname-and-nodeid table column markup which is duplicated with each other, introducer.xhtml, and deep-check-results.xhtml. All of these (and any other presentations of nickname-and-nodeid) should be combined. + for shareid in sorted(data["sharemap"].keys()): serverids = data["sharemap"][shareid] for i,serverid in enumerate(serverids): hunk ./src/allmydata/web/introweb.py 67 return simplejson.dumps(res, indent=1) + "\n" + # FIXME: This code is duplicated in root.py and introweb.py. def data_version(self, ctx, data): return get_package_versions_string() def data_import_path(self, ctx, data): hunk ./src/allmydata/web/root.py 180 child_report_incident = IncidentReporter() #child_server # let's reserve this for storage-server-over-HTTP + # FIXME: This code is duplicated in root.py and introweb.py. def data_version(self, ctx, data): return get_package_versions_string() def data_import_path(self, ctx, data): } [Tweak wording in directory page: not-read-only is "modifiable", mention creating a directory _in this directory_. Kevin Reid **20090526232414 Ignore-this: f006ec52ba2051802e025a60bcface56 ] { hunk ./src/allmydata/test/test_web.py 916 d.addCallback(lambda res: self.GET(self.public_url + "/reedownlee", followRedirect=True)) def _check2(res): - self.failUnless("(readonly)" in res, res) + self.failUnless("(read-only)" in res, res) self.failIf("Upload a file" in res, res) d.addCallback(_check2) hunk ./src/allmydata/test/test_web.py 932 d.addCallback(lambda res: self.GET(self.public_url + "/foo/empty/")) def _check4(res): self.failUnless("directory is empty" in res, res) - MKDIR_BUTTON_RE=re.compile('.*Create a new directory.*', re.I) + MKDIR_BUTTON_RE=re.compile('.*Create a new directory in this directory.*', re.I) self.failUnless(MKDIR_BUTTON_RE.search(res), res) d.addCallback(_check4) hunk ./src/allmydata/web/directory.py 527 def render_title(self, ctx, data): si_s = abbreviated_dirnode(self.node) - header = ["Directory SI=%s" % si_s] + header = ["AllMyData - Tahoe - Directory SI=%s" % si_s] + if self.node.is_readonly(): + header.append(" (read-only)") + else: + header.append(" (modifiable)") return ctx.tag[header] def render_header(self, ctx, data): hunk ./src/allmydata/web/directory.py 538 si_s = abbreviated_dirnode(self.node) header = ["Directory SI=%s" % si_s] if self.node.is_readonly(): - header.append(" (readonly)") + header.append(" (read-only)") return ctx.tag[header] def render_welcome(self, ctx, data): hunk ./src/allmydata/web/directory.py 681 T.fieldset[ T.input(type="hidden", name="t", value="mkdir"), T.input(type="hidden", name="when_done", value="."), - T.legend(class_="freeform-form-label")["Create a new directory"], + T.legend(class_="freeform-form-label")["Create a new directory in this directory"], "New directory name: ", T.input(type="text", name="name"), " ", T.input(type="submit", value="Create"), } [Modify markup of Tahoe web pages to be more amenable to styling; some minor changes of wording. Kevin Reid **20090526232545 Ignore-this: 8845937f0df6c7ddc07abe3211428a6f ] { hunk ./src/allmydata/test/test_checker.py 106 s = self.remove_tags(html) self.failUnlessIn("File Check Results for SI=2k6avp", s) # abbreviated self.failUnlessIn("Not Recoverable! : rather dead", s) - self.failUnlessIn("Corrupt shares: sh#2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa (peer-0)", s) + self.failUnlessIn("Corrupt shares: Share ID Nickname Node ID sh#2 peer-0 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", s) html = self.render2(w) s = self.remove_tags(html) hunk ./src/allmydata/test/test_system.py 1104 public = "uri/" + self._root_directory_uri d = getPage(base) def _got_welcome(page): - expected = "Connected Storage Servers: %d" % (self.numclients) + # XXX This test is oversensitive to formatting + expected = "Connected to %d\n of %d known storage servers:" % (self.numclients, self.numclients) self.failUnless(expected in page, "I didn't see the right 'connected storage servers'" " message in: %s" % page hunk ./src/allmydata/test/test_system.py 1110 ) - expected = "My nodeid: %s" % (b32encode(self.clients[0].nodeid).lower(),) + expected = "My nodeid: %s" % (b32encode(self.clients[0].nodeid).lower(),) self.failUnless(expected in page, "I didn't see the right 'My nodeid' message " "in: %s" % page) hunk ./src/allmydata/test/test_web.py 882 # the FILE reference points to a URI, but it should end in bar.txt bar_url = ("%s/file/%s/@@named=/bar.txt" % (ROOT, urllib.quote(self._bar_txt_uri))) - get_bar = "".join([r'', + get_bar = "".join([r'FILE', + r'\s+', r'bar.txt' % bar_url, r'', hunk ./src/allmydata/test/test_web.py 886 - r'\s+FILE', r'\s+%d' % len(self.BAR_CONTENTS), ]) self.failUnless(re.search(get_bar, res), res) hunk ./src/allmydata/test/test_web.py 907 # the DIR reference just points to a URI sub_url = ("%s/uri/%s/" % (ROOT, urllib.quote(self._sub_uri))) - get_sub = ((r'sub' % sub_url) - + r'\s+DIR') + get_sub = ((r'DIR') + +r'\s+sub' % sub_url) self.failUnless(re.search(get_sub, res), res) d.addCallback(_check) hunk ./src/allmydata/test/test_web.py 924 d.addCallback(lambda res: self.GET(self.public_url, followRedirect=True)) def _check3(res): - self.failUnless(re.search(r'reedownlee' - '\s+DIR-RO', res)) + self.failUnless(re.search('DIR-RO' + r'\s+reedownlee', res), res) d.addCallback(_check3) # and an empty directory hunk ./src/allmydata/test/test_web.py 1898 # Fetch the welcome page. d = self.GET("/") def _after_get_welcome_page(res): - MKDIR_BUTTON_RE=re.compile('

', re.I) + MKDIR_BUTTON_RE=re.compile('', re.I) mo = MKDIR_BUTTON_RE.search(res) formaction = mo.group(1) formt = mo.group(2) hunk ./src/allmydata/web/check_results.py 100 for (serverid, si, shnum) in data["list-corrupt-shares"]: nickname = c.get_nickname_for_peerid(serverid) badsharemap.append(T.tr[T.td["sh#%d" % shnum], - T.td[T.tt[base32.b2a(serverid)], - " (", nickname, ")"], + T.td[T.div(class_="nickname")[nickname], + T.div(class_="nodeid")[T.tt[base32.b2a(serverid)]]], ]) hunk ./src/allmydata/web/check_results.py 103 - add("Corrupt shares", T.table(border="1")[badsharemap]) + add("Corrupt shares", T.table()[ + T.tr[T.th["Share ID"], + T.th(class_="nickname-and-peerid")[T.div["Nickname"], T.div(class_="nodeid")["Node ID"]]], + badsharemap]) else: add("Corrupt shares", "none") hunk ./src/allmydata/web/check_results.py 128 shareid_s = shareid nickname = c.get_nickname_for_peerid(serverid) sharemap.append(T.tr[T.td[shareid_s], - T.td[T.tt[base32.b2a(serverid)], - " (", nickname, ")"], + T.td[T.div(class_="nickname")[nickname], + T.div(class_="nodeid")[T.tt[base32.b2a(serverid)]]] ]) add("Good Shares (sorted in share order)", hunk ./src/allmydata/web/check_results.py 132 - T.table(border="1")[sharemap]) + T.table()[T.tr[T.th["Share ID"], T.th(class_="nickname-and-peerid")[T.div["Nickname"], T.div(class_="nodeid")["Node ID"]]], + sharemap]) add("Recoverable Versions", data["count-recoverable-versions"]) hunk ./src/allmydata/web/check_results.py 152 shareids = servers.get(serverid, []) shareids.reverse() shareids_s = [ T.tt[shareid, " "] for shareid in sorted(shareids) ] - servermap.append(T.tr[T.td[T.tt[base32.b2a(serverid)], - " (", nickname, ")"], - T.td[shareids_s] ]) + servermap.append(T.tr[T.td[T.div(class_="nickname")[nickname], + T.div(class_="nodeid")[T.tt[base32.b2a(serverid)]]], + T.td[shareids_s], + ]) num_shares_left -= len(shareids) if not num_shares_left: break hunk ./src/allmydata/web/check_results.py 160 add("Share Balancing (servers in permuted order)", - T.table(border="1")[servermap]) + T.table()[T.tr[T.th(class_="nickname-and-peerid")[T.div["Nickname"], T.div(class_="nodeid")["Node ID"]], T.th["Share IDs"]], + servermap]) return T.ul[r] hunk ./src/allmydata/web/deep-check-and-repair-results.xhtml 72

- +

hunk ./src/allmydata/web/deep-check-results.xhtml 46

Corrupt Shares

If repair fails, these shares need to be manually inspected and removed.

Relative Path

Healthy Pre-Repair

hunk ./src/allmydata/web/deep-check-results.xhtml 66

All Results

Server

Server Nickname

hunk ./src/allmydata/web/directory.py 536 def render_header(self, ctx, data): si_s = abbreviated_dirnode(self.node) - header = ["Directory SI=%s" % si_s] + header = ["Directory SI=", T.span(class_="data-chars")[si_s]] if self.node.is_readonly(): header.append(" (read-only)") return ctx.tag[header] hunk ./src/allmydata/web/directory.xhtml 8 -

hunk ./src/allmydata/web/directory.xhtml 10 -

Refresh this view

Relative Path

Healthy

- - - - - - - - - - - - - - - - - - +

Filename	Type	Size	Times

+ + + + + + + + + + + + + + + + + + hunk ./src/allmydata/web/directory.xhtml 39 - + hunk ./src/allmydata/web/directory.xhtml 41 -

Type	Filename	Size	Times

directory is empty
This directory is empty.

hunk ./src/allmydata/web/directory.xhtml 44 +

hunk ./src/allmydata/web/directory.xhtml 47 -

- -

hunk ./src/allmydata/web/directory.xhtml 50 - - + hunk ./src/allmydata/web/info.xhtml 9 -

+ + +

Object Type:
Storage Index:

Object Size: - Access Caps (URIs): - + Access Caps (Tahoe-URIs): + hunk ./src/allmydata/web/info.xhtml 21 - - + + hunk ./src/allmydata/web/info.xhtml 25 - - + + hunk ./src/allmydata/web/info.xhtml 29 - - + + hunk ./src/allmydata/web/info.xhtml 35 - - + + hunk ./src/allmydata/web/info.xhtml 39 - - + + hunk ./src/allmydata/web/info.xhtml 43 - - + + Directory writecap Directory writecap Directory readcap Directory readcap Directory verifycap Directory verifycap File writecap File writecap File readcap File readcap File verifycap File verifycap JSON hunk ./src/allmydata/web/info.xhtml 69 - - - + hunk ./src/allmydata/web/introducer.xhtml 24 Service Announcements - + hunk ./src/allmydata/web/introducer.xhtml 46 Subscribed Clients - PeerID / Nickname Advertised IPs + hunk ./src/allmydata/web/introweb.py 71 def data_version(self, ctx, data): return get_package_versions_string() def data_import_path(self, ctx, data): - return str(allmydata) + return str(allmydata).replace("/", "/ ") # XXX kludge for wrapping def data_my_nodeid(self, ctx, data): return idlib.nodeid_b2a(self.introducer_node.nodeid) hunk ./src/allmydata/web/manifest.xhtml 15 - PeerID / Nickname Advertised IPs + hunk ./src/allmydata/web/reliability.xhtml 45 - Path cap + hunk ./src/allmydata/web/root.py 279 TIME_FORMAT = "%H:%M:%S %d-%b-%Y" ctx.fillSlots("connected", connected) + ctx.fillSlots("connected-bool", not not rsc.rref) ctx.fillSlots("since", time.strftime(TIME_FORMAT, time.localtime(since))) ctx.fillSlots("announced", time.strftime(TIME_FORMAT, time.localtime(rsc.announcement_time))) hunk ./src/allmydata/web/root.py 294 enctype="multipart/form-data")[ T.fieldset[ T.legend(class_="freeform-form-label")["Download a file"], - "URI to download: ", - T.input(type="text", name="uri"), " ", - "Filename to download as: ", - T.input(type="text", name="filename"), " ", + T.div["Tahoe-URI to download: ", + T.input(type="text", name="uri")], + T.div["Filename to download as: ", + T.input(type="text", name="filename")], T.input(type="submit", value="Download!"), ]] return T.div[form] hunk ./src/allmydata/web/root.py 309 enctype="multipart/form-data")[ T.fieldset[ T.legend(class_="freeform-form-label")["View a file or directory"], - "URI to view: ", + "Tahoe-URI to view: ", T.input(type="text", name="uri"), " ", T.input(type="submit", value="View!"), ]] hunk ./src/allmydata/web/root.py 321 enctype="multipart/form-data")[ T.fieldset[ T.legend(class_="freeform-form-label")["Upload a file"], - "Choose a file: ", - T.input(type="file", name="file", class_="freeform-input-file"), + T.div["Choose a file: ", + T.input(type="file", name="file", class_="freeform-input-file")], T.input(type="hidden", name="t", value="upload"), hunk ./src/allmydata/web/root.py 324 - " Mutable?:", T.input(type="checkbox", name="mutable"), - T.input(type="submit", value="Upload!"), + T.div[T.input(type="checkbox", name="mutable"), T.label(for_="mutable")["Create mutable file"], + " ", T.input(type="submit", value="Upload!")], ]] return T.div[form] hunk ./src/allmydata/web/root.py 334 form = T.form(action="uri", method="post", enctype="multipart/form-data")[ T.fieldset[ - T.legend(class_="freeform-form-label")["Create a directory."], + T.legend(class_="freeform-form-label")["Create a directory"], T.input(type="hidden", name="t", value="mkdir"), T.input(type="hidden", name="redirect_to_result", value="true"), hunk ./src/allmydata/web/root.py 337 - T.input(type="submit", value="create directory"), + T.input(type="submit", value="Create a directory"), ]] return T.div[form] hunk ./src/allmydata/web/status.xhtml 14 Active Operations: - t P_repair + hunk ./src/allmydata/web/status.xhtml 16 - - - - - - + + + + + + hunk ./src/allmydata/web/status.xhtml 36 Recent Operations: - Type Storage Index Helper? Total Size Progress Status Type Storage Index Helper? Total Size Progress Status + hunk ./src/allmydata/web/status.xhtml 38 - - - - - - - + + + + + + + hunk ./src/allmydata/web/welcome.xhtml 10 Welcome To AllMyData "Tahoe"! -Status of this Client + + This Client hunk ./src/allmydata/web/welcome.xhtml 13 -My nodeid: -My nickname: -My versions: -Tahoe code imported from: -Services Running: + + Recent Uploads and Downloads, + Operational Statistics + hunk ./src/allmydata/web/welcome.xhtml 18 - - Recent Uploads and Downloads, - Operational Statistics - - -The Controls + Started Type Storage Index Helper? Total Size Progress Status Started Type Storage Index Helper? Total Size Progress Status + + + + + + My nickname: My nodeid: My versions: Tahoe code imported from: Services running: + hunk ./src/allmydata/web/welcome.xhtml 27 -There are also controls for each directory on that directory's page. + hunk ./src/allmydata/web/welcome.xhtml 29 - - - - + +Controls hunk ./src/allmydata/web/welcome.xhtml 32 + There are also controls for each directory on that directory's page. hunk ./src/allmydata/web/welcome.xhtml 34 -Status of the Storage Grid + + + + + hunk ./src/allmydata/web/welcome.xhtml 40 -Introducer: -Connected to introducer?: + + Status of the Storage Grid hunk ./src/allmydata/web/welcome.xhtml 43 -Helper: -Connected to helper?: + + connected- + Introducer: + Connected to introducer?: + hunk ./src/allmydata/web/welcome.xhtml 49 - + + connected- + Helper: + Connected to helper?: + hunk ./src/allmydata/web/welcome.xhtml 55 -Known Storage Servers: -Connected Storage Servers: + Connected to + of known storage servers: hunk ./src/allmydata/web/welcome.xhtml 58 - - - - - - - - - - - - - - - - - - - - - -PeerID Nickname Connected? Since Announced Version Service Name no peers! + + + + + + + + + + + + + + + + + + + + Service Name + Nickname + PeerID Connected? since First Announced Version + + + service-connected connected- + + no peers! + hunk ./src/allmydata/web/welcome.xhtml 88 -Other Resources + + Other Resources hunk ./src/allmydata/web/welcome.xhtml 91 -Please visit the Tahoe home page for -code updates and bug reporting. + Please visit the Tahoe home page for + code updates and bug reporting. hunk ./src/allmydata/web/welcome.xhtml 94 -The provisioning tool and reliability calculator may also be useful. + The provisioning tool and reliability calculator may also be useful. hunk ./src/allmydata/web/welcome.xhtml 97 - + + hunk ./src/allmydata/web/welcome.xhtml 100 - - + } Context: [accounting-overview.txt: more edits warner@lothar.com**20090523190359] [accounting-overview.txt: small edits warner@lothar.com**20090523184011] [_auto_deps.py: require foolscap-0.4.1, which adds an important fix for py2.4 warner@lothar.com**20090523011103] [immutable/encode.py: tolerate immediate _remove_shareholder by copying the warner@lothar.com**20090522184424 landlord list before iterating over it. This can probably only happen in unit tests, but cleaning it up makes certain test failures easier to analyze. ] [switch to using RemoteException instead of 'wrapped' RemoteReferences. Should fix #653, the rref-EQ problem warner@lothar.com**20090522004632] [switch all foolscap imports to use foolscap.api or foolscap.logging warner@lothar.com**20090522003823] [_auto_deps.py: bump our foolscap dependency to 0.4.0, since I'm about to start using its new features warner@lothar.com**20090522002100] [test_runner.py: fix minor typo warner@lothar.com**20090520033620] [setup: fix bug (wrong import) in error message, as noticed by pyflakes zooko@zooko.com**20090519195642 Ignore-this: f1b9f8c00b46c1b5f2f20e5fc424f341 ] [setup: fix trivial bug in recent patch to test base64.py at startup zooko@zooko.com**20090519195129 Ignore-this: f6be038f74b53ca69e7109fe34adfbc ] [setup: make Tahoe exit at startup with a useful error message if the base64.py module is buggy (fixes part of #710) zooko@zooko.com**20090519194555 Ignore-this: aa4d398235ddca8d417d61c9688e154 ] [test_introducer.py: add a test for the python2.4.0/2.4.1 bug in base64.b32decode warner@lothar.com**20090519034101] [immutable WriteBucketProxy: use pipeline to speed up uploads by overlapping roundtrips, for #392 warner@lothar.com**20090518234422] [util/pipeline.py: new utility class to manage size-limited work pipelines, for #392 warner@lothar.com**20090518234326] [docs: add a diagram that I'm about to show to the Boulder Linux Users Group: network-and-reliance-topology.svg zooko@zooko.com**20090514232059 Ignore-this: 2420c0a7c254c9f0f2349d9130490d33 ] [tests: mark test_runner as coded in utf-8 instead of ascii zooko@zooko.com**20090507223151 Ignore-this: ccf1ba9e5a9b53602701a36f9fdb545e ] [tests: raise timeout on test_runner.RunNode.test_introducer from 120s to 240s, since it hit the 120s time-out on François Lenny-armv5tel zooko@zooko.com**20090507215012 Ignore-this: ba18fe6832ba255d4971e8f623ed7da5 ] [setup: fix comment in setup.py zooko@zooko.com**20090507215003 Ignore-this: c46ef664630d52733138ef7fbc551c1c ] [docs: how_to_make_a_tahoe_release.txt: a couple of small edits zooko@zooko.com**20090507214932 Ignore-this: ae92aa835ad369f4b9e6e49d681957a3 ] [.darcs-boringfile: also ignore .gitignore warner@allmydata.com**20090415210550 Ignore-this: d29db314a1e506f6240859559436b4c3 ] [.darcs-boringfile: ignore .git, I'm starting to play around with it warner@allmydata.com**20090415205929 Ignore-this: 89234453516483c9586cd6e1351e88b5 ] [fix quicktest: stop using setuptools, add misc/run-with-pythonpath.py, to make it run faster warner@lothar.com**20090414201400] [TAG allmydata-tahoe-1.4.1 zooko@zooko.com**20090414025636 Ignore-this: de78fc32364c83e9f4e26b5abcfdea4a ] Patch bundle hash: 7ad24d0f65a6edc9460ed8780b24834733d4e0c4