From: Kevan Carstensen Date: Thu, 15 Jul 2010 23:17:14 +0000 (-0700) Subject: immutable/upload.py: abort buckets if peer selection fails X-Git-Tag: allmydata-tahoe-1.7.1~18 X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/flags/quickstart.html?a=commitdiff_plain;h=6d2c216b8f5411731897e9ae8b56ad894fb76051;p=tahoe-lafs%2Ftahoe-lafs.git immutable/upload.py: abort buckets if peer selection fails --- diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index ca7d56be..3f4803af 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -135,6 +135,15 @@ class PeerTracker: return (alreadygot, set(b.keys())) + def abort(self): + """ + I abort the remote bucket writers for the share numbers in + sharenums. This is a good idea to conserve space on the storage + server. + """ + for writer in self.buckets.itervalues(): writer.abort() + + class Tahoe2PeerSelector: def __init__(self, upload_id, logparent=None, upload_status=None): @@ -355,8 +364,7 @@ class Tahoe2PeerSelector: self.needed_shares, self.servers_of_happiness, effective_happiness) - raise UploadUnhappinessError("%s (%s)" % (msg, - self._get_progress_message())) + return self._failed("%s (%s)" % (msg, self._get_progress_message())) if self.uncontacted_peers: peer = self.uncontacted_peers.pop(0) @@ -417,7 +425,7 @@ class Tahoe2PeerSelector: if self.last_failure_msg: msg += " (%s)" % (self.last_failure_msg,) log.msg(msg, level=log.UNUSUAL, parent=self._log_parent) - raise UploadUnhappinessError(msg) + return self._failed(msg) else: # we placed enough to be happy, so we're done if self._status: @@ -506,6 +514,21 @@ class Tahoe2PeerSelector: return self._loop() + def _failed(self, msg): + """ + I am called when peer selection fails. I first abort all of the + remote buckets that I allocated during my unsuccessful attempt to + place shares for this file. I then raise an + UploadUnhappinessError with my msg argument. + """ + for peer in self.use_peers: + assert isinstance(peer, PeerTracker) + + peer.abort() + + raise UploadUnhappinessError(msg) + + class EncryptAnUploadable: """This is a wrapper that takes an IUploadable and provides IEncryptedUploadable."""