From: Brian Warner Date: Tue, 24 Feb 2009 22:40:17 +0000 (-0700) Subject: test_web: add (disabled) test to see what happens when deep-check encounters an unrec... X-Git-Url: https://git.rkrishnan.org/readonly?a=commitdiff_plain;h=2810de32b13f2534cbce1489387215f74b22145e;p=tahoe-lafs%2Ftahoe-lafs.git test_web: add (disabled) test to see what happens when deep-check encounters an unrecoverable directory. We still need code changes to improve this behavior. --- diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py index c8211c48..8aa59799 100644 --- a/src/allmydata/interfaces.py +++ b/src/allmydata/interfaces.py @@ -1620,6 +1620,12 @@ class IDeepCheckable(Interface): I return a Monitor, with results that are an IDeepCheckResults object. + + TODO: If any of the directories I traverse are unrecoverable, the + Monitor will report failure. If any of the files I check upon are + unrecoverable, those problems will be reported in the + IDeepCheckResults as usual, and the Monitor will not report a + failure. """ def start_deep_check_and_repair(verify=False, add_lease=False): @@ -1631,6 +1637,12 @@ class IDeepCheckable(Interface): I return a Monitor, with results that are an IDeepCheckAndRepairResults object. + + TODO: If any of the directories I traverse are unrecoverable, the + Monitor will report failure. If any of the files I check upon are + unrecoverable, those problems will be reported in the + IDeepCheckResults as usual, and the Monitor will not report a + failure. """ class ICheckResults(Interface): diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py index accaa5aa..99705d71 100644 --- a/src/allmydata/test/test_web.py +++ b/src/allmydata/test/test_web.py @@ -15,10 +15,11 @@ from allmydata.scripts.debug import CorruptShareOptions, corrupt_share from allmydata.util import fileutil, base32 from allmydata.util.assertutil import precondition from allmydata.test.common import FakeDirectoryNode, FakeCHKFileNode, \ - FakeMutableFileNode, create_chk_filenode, WebErrorMixin + FakeMutableFileNode, create_chk_filenode, WebErrorMixin, ShouldFailMixin from allmydata.interfaces import IURI, INewDirectoryURI, \ IReadonlyNewDirectoryURI, IFileURI, IMutableFileURI, IMutableFileNode from allmydata.mutable import servermap, publish, retrieve +from allmydata.mutable.common import UnrecoverableFileError import common_util as testutil from allmydata.test.no_network import GridTestMixin @@ -2543,7 +2544,7 @@ class Util(unittest.TestCase): self.failUnlessEqual(convert2(["1","2"]), "has shares: 1,2") -class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase): +class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase, ShouldFailMixin): def GET(self, urlpath, followRedirect=False, return_response=False, method="GET", clientnum=0, **kwargs): @@ -2829,19 +2830,34 @@ class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase): d.addCallback(_stash_root_and_create_file) def _stash_uri(fn, which): self.uris[which] = fn.get_uri() + return fn d.addCallback(_stash_uri, "good") d.addCallback(lambda ign: self.rootnode.add_file(u"small", upload.Data("literal", convergence=""))) d.addCallback(_stash_uri, "small") + d.addCallback(lambda ign: + self.rootnode.add_file(u"sick", + upload.Data(DATA+"1", + convergence=""))) + d.addCallback(_stash_uri, "sick") + + def _clobber_shares(ignored): + self.delete_shares_numbered(self.uris["sick"], [0,1]) + d.addCallback(_clobber_shares) + + # root + # root/good + # root/small + # root/sick d.addCallback(self.CHECK, "root", "t=stream-deep-check") def _done(res): units = [simplejson.loads(line) for line in res.splitlines() if line] - self.failUnlessEqual(len(units), 3+1) + self.failUnlessEqual(len(units), 4+1) # should be parent-first u0 = units[0] self.failUnlessEqual(u0["path"], []) @@ -2859,11 +2875,35 @@ class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase): stats = units[-1] self.failUnlessEqual(stats["type"], "stats") s = stats["stats"] - self.failUnlessEqual(s["count-immutable-files"], 1) + self.failUnlessEqual(s["count-immutable-files"], 2) self.failUnlessEqual(s["count-literal-files"], 1) self.failUnlessEqual(s["count-directories"], 1) d.addCallback(_done) + # now add root/subdir and root/subdir/grandchild, then make subdir + # unrecoverable, then see what happens + + d.addCallback(lambda ign: + self.rootnode.create_empty_directory(u"subdir")) + d.addCallback(_stash_uri, "subdir") + d.addCallback(lambda subdir_node: + subdir_node.add_file(u"grandchild", + upload.Data(DATA+"2", + convergence=""))) + d.addCallback(_stash_uri, "grandchild") + + d.addCallback(lambda ign: + self.delete_shares_numbered(self.uris["subdir"], + range(10))) + + ## argh! how should a streaming-JSON API indicate fatal error? + ## answer: emit ERROR: instead of a JSON string + #d.addCallback(lambda ign: + # self.shouldFail(UnrecoverableFileError, 'check-subdir', + # "no recoverable versions", + # self.CHECK, "ignored", + # "root", "t=stream-deep-check")) + d.addErrback(self.explain_web_error) return d @@ -2919,6 +2959,11 @@ class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase): #corrupt_share(cso) d.addCallback(_clobber_shares) + # root + # root/good CHK, 10 shares + # root/small LIT + # root/sick CHK, 9 shares + d.addCallback(self.CHECK, "root", "t=stream-deep-check&repair=true") def _done(res): units = [simplejson.loads(line)