immutable/checker: wrap comments to 80cols, my laptop does not have a wide screen. No functional changes.

This commit is contained in:
Brian Warner 2009-02-07 14:04:39 -07:00
parent 50886ea494
commit 38ee95fec4

View File

@ -9,22 +9,25 @@ from allmydata.util import base32, deferredutil, dictutil, log, rrefutil
from allmydata.immutable import layout from allmydata.immutable import layout
class Checker(log.PrefixingLogMixin): class Checker(log.PrefixingLogMixin):
""" I query all servers to see if M uniquely-numbered shares are available. """I query all servers to see if M uniquely-numbered shares are
available.
If the verify flag was passed to my constructor, then for each share I download every data If the verify flag was passed to my constructor, then for each share I
block and all metadata from each server and perform a cryptographic integrity check on all download every data block and all metadata from each server and perform a
of it. If not, I just ask each server "Which shares do you have?" and believe its answer. cryptographic integrity check on all of it. If not, I just ask each
server 'Which shares do you have?' and believe its answer.
In either case, I wait until I have gotten responses from all servers. This fact -- that I In either case, I wait until I have gotten responses from all servers.
wait -- means that an ill-behaved server which fails to answer my questions will make me This fact -- that I wait -- means that an ill-behaved server which fails
wait indefinitely. If it is ill-behaved in a way that triggers the underlying foolscap to answer my questions will make me wait indefinitely. If it is
timeouts, then I will wait only as long as those foolscap timeouts, but if it is ill-behaved ill-behaved in a way that triggers the underlying foolscap timeouts, then
in a way which placates the foolscap timeouts but still doesn't answer my question then I I will wait only as long as those foolscap timeouts, but if it is
will wait indefinitely. ill-behaved in a way which placates the foolscap timeouts but still
doesn't answer my question then I will wait indefinitely.
Before I send any new request to a server, I always ask the "monitor" object that was passed Before I send any new request to a server, I always ask the 'monitor'
into my constructor whether this task has been cancelled (by invoking its object that was passed into my constructor whether this task has been
raise_if_cancelled() method). cancelled (by invoking its raise_if_cancelled() method).
""" """
def __init__(self, client, verifycap, servers, verify, monitor): def __init__(self, client, verifycap, servers, verify, monitor):
assert precondition(isinstance(verifycap, CHKFileVerifierURI), verifycap, type(verifycap)) assert precondition(isinstance(verifycap, CHKFileVerifierURI), verifycap, type(verifycap))
@ -46,11 +49,13 @@ class Checker(log.PrefixingLogMixin):
self._share_hash_tree = None self._share_hash_tree = None
def _get_buckets(self, server, storageindex, serverid): def _get_buckets(self, server, storageindex, serverid):
""" Return a deferred that eventually fires with ({sharenum: bucket}, serverid, """Return a deferred that eventually fires with ({sharenum: bucket},
success). In case the server is disconnected or returns a Failure then it fires with serverid, success). In case the server is disconnected or returns a
({}, serverid, False) (A server disconnecting or returning a Failure when we ask it for Failure then it fires with ({}, serverid, False) (A server
buckets is the same, for our purposes, as a server that says it has none, except that we disconnecting or returning a Failure when we ask it for buckets is
want to track and report whether or not each server responded.)""" the same, for our purposes, as a server that says it has none, except
that we want to track and report whether or not each server
responded.)"""
d = server.callRemote("get_buckets", storageindex) d = server.callRemote("get_buckets", storageindex)
@ -70,31 +75,39 @@ class Checker(log.PrefixingLogMixin):
return d return d
def _download_and_verify(self, serverid, sharenum, bucket): def _download_and_verify(self, serverid, sharenum, bucket):
""" Start an attempt to download and verify every block in this bucket and return a """Start an attempt to download and verify every block in this bucket
deferred that will eventually fire once the attempt completes. and return a deferred that will eventually fire once the attempt
completes.
If you download and verify every block then fire with (True, sharenum, None), else if If you download and verify every block then fire with (True,
the share data couldn't be parsed because it was of an unknown version number fire with sharenum, None), else if the share data couldn't be parsed because it
(False, sharenum, 'incompatible'), else if any of the blocks were invalid, fire with was of an unknown version number fire with (False, sharenum,
(False, sharenum, 'corrupt'), else if the server disconnected (False, sharenum, 'incompatible'), else if any of the blocks were invalid, fire with
'disconnect'), else if the server returned a Failure during the process fire with (False, sharenum, 'corrupt'), else if the server disconnected (False,
(False, sharenum, 'failure'). sharenum, 'disconnect'), else if the server returned a Failure during
the process fire with (False, sharenum, 'failure').
If there is an internal error such as an uncaught exception in this code, then the If there is an internal error such as an uncaught exception in this
deferred will errback, but if there is a remote error such as the server failing or the code, then the deferred will errback, but if there is a remote error
returned data being incorrect then it will not errback -- it will fire normally with the such as the server failing or the returned data being incorrect then
indicated results. """ it will not errback -- it will fire normally with the indicated
results."""
b = layout.ReadBucketProxy(bucket, serverid, self._verifycap.storage_index) b = layout.ReadBucketProxy(bucket, serverid, self._verifycap.storage_index)
veup = download.ValidatedExtendedURIProxy(b, self._verifycap) veup = download.ValidatedExtendedURIProxy(b, self._verifycap)
d = veup.start() d = veup.start()
def _errb(f): def _errb(f):
# Okay, we didn't succeed at fetching and verifying all the blocks of this # Okay, we didn't succeed at fetching and verifying all the
# share. Now we need to handle different reasons for failure differently. If # blocks of this share. Now we need to handle different reasons
# the failure isn't one of the following four classes then it will get # for failure differently. If the failure isn't one of the
# re-raised. # following four classes then it will get re-raised.
failtype = f.trap(DeadReferenceError, rrefutil.ServerFailure, layout.LayoutInvalid, layout.RidiculouslyLargeURIExtensionBlock, download.BadOrMissingHash, download.BadURIExtensionHashValue) failtype = f.trap(DeadReferenceError,
rrefutil.ServerFailure,
layout.LayoutInvalid,
layout.RidiculouslyLargeURIExtensionBlock,
download.BadOrMissingHash,
download.BadURIExtensionHashValue)
if failtype is DeadReferenceError: if failtype is DeadReferenceError:
return (False, sharenum, 'disconnect') return (False, sharenum, 'disconnect')
@ -122,7 +135,8 @@ class Checker(log.PrefixingLogMixin):
ds.append(d2) ds.append(d2)
dl = deferredutil.gatherResults(ds) dl = deferredutil.gatherResults(ds)
# dl will fire once every block of this share has been downloaded and verified, or else it will errback. # dl will fire once every block of this share has been downloaded
# and verified, or else it will errback.
def _cb(result): def _cb(result):
return (True, sharenum, None) return (True, sharenum, None)
@ -136,20 +150,27 @@ class Checker(log.PrefixingLogMixin):
return d return d
def _verify_server_shares(self, serverid, ss): def _verify_server_shares(self, serverid, ss):
""" Return a deferred which eventually fires with a tuple of (set(sharenum), serverid, """ Return a deferred which eventually fires with a tuple of
set(corruptsharenum), set(incompatiblesharenum), success) showing all the shares (set(sharenum), serverid, set(corruptsharenum),
verified to be served by this server, and all the corrupt shares served by the server, set(incompatiblesharenum), success) showing all the shares verified
and all the incompatible shares served by the server. In case the server is to be served by this server, and all the corrupt shares served by the
disconnected or returns a Failure then it fires with the last element False. A server server, and all the incompatible shares served by the server. In case
disconnecting or returning a failure when we ask it for shares is the same, for our the server is disconnected or returns a Failure then it fires with
purposes, as a server that says it has none or offers invalid ones, except that we want the last element False.
to track and report the server's behavior. Similarly, the presence of corrupt shares is
mainly of use for diagnostics -- you can typically treat it as just like being no share A server disconnecting or returning a failure when we ask it for
at all by just observing its absence from the verified shares dict and ignoring its shares is the same, for our purposes, as a server that says it has
presence in the corrupt shares dict. The 'success' argument means whether the server none or offers invalid ones, except that we want to track and report
responded to *any* queries during this process, so if it responded to some queries and the server's behavior. Similarly, the presence of corrupt shares is
then disconnected and ceased responding, or returned a failure, it is still marked with mainly of use for diagnostics -- you can typically treat it as just
the True flag for 'success'. like being no share at all by just observing its absence from the
verified shares dict and ignoring its presence in the corrupt shares
dict.
The 'success' argument means whether the server responded to *any*
queries during this process, so if it responded to some queries and
then disconnected and ceased responding, or returned a failure, it is
still marked with the True flag for 'success'.
""" """
d = self._get_buckets(ss, self._verifycap.storage_index, serverid) d = self._get_buckets(ss, self._verifycap.storage_index, serverid)
@ -188,12 +209,13 @@ class Checker(log.PrefixingLogMixin):
return d return d
def _check_server_shares(self, serverid, ss): def _check_server_shares(self, serverid, ss):
""" Return a deferred which eventually fires with a tuple of (set(sharenum), serverid, """Return a deferred which eventually fires with a tuple of
set(), set(), responded) showing all the shares claimed to be served by this server. In (set(sharenum), serverid, set(), set(), responded) showing all the
case the server is disconnected then it fires with (set() serverid, set(), set(), False) shares claimed to be served by this server. In case the server is
(a server disconnecting when we ask it for buckets is the same, for our purposes, as a disconnected then it fires with (set() serverid, set(), set(), False)
server that says it has none, except that we want to track and report whether or not (a server disconnecting when we ask it for buckets is the same, for
each server responded.)""" our purposes, as a server that says it has none, except that we want
to track and report whether or not each server responded.)"""
def _curry_empty_corrupted(res): def _curry_empty_corrupted(res):
buckets, serverid, responded = res buckets, serverid, responded = res
return (set(buckets), serverid, set(), set(), responded) return (set(buckets), serverid, set(), set(), responded)
@ -245,15 +267,17 @@ class Checker(log.PrefixingLogMixin):
d['servers-responding'] = list(servers) d['servers-responding'] = list(servers)
d['sharemap'] = verifiedshares d['sharemap'] = verifiedshares
d['count-wrong-shares'] = 0 # no such thing as wrong shares of an immutable file # no such thing as wrong shares of an immutable file
d['count-wrong-shares'] = 0
d['list-corrupt-shares'] = corruptsharelocators d['list-corrupt-shares'] = corruptsharelocators
d['count-corrupt-shares'] = len(corruptsharelocators) d['count-corrupt-shares'] = len(corruptsharelocators)
d['list-incompatible-shares'] = incompatiblesharelocators d['list-incompatible-shares'] = incompatiblesharelocators
d['count-incompatible-shares'] = len(incompatiblesharelocators) d['count-incompatible-shares'] = len(incompatiblesharelocators)
# The file needs rebalancing if the set of servers that have at least one share is less # The file needs rebalancing if the set of servers that have at least
# than the number of uniquely-numbered shares available. # one share is less than the number of uniquely-numbered shares
# available.
cr.set_needs_rebalancing(d['count-good-share-hosts'] < d['count-shares-good']) cr.set_needs_rebalancing(d['count-good-share-hosts'] < d['count-shares-good'])
cr.set_data(d) cr.set_data(d)