immutable: don't catch all exception when downloading, catch only DeadReferenceError and IntegrityCheckReject

This commit is contained in:
Zooko O'Whielacronx 2008-12-21 17:41:35 -07:00
parent ad58f8b693
commit c54783f5e1
1 changed files with 2 additions and 5 deletions

View File

@ -489,11 +489,8 @@ class BlockDownloader(log.PrefixingLogMixin):
self.parent.hold_block(self.blocknum, data) self.parent.hold_block(self.blocknum, data)
def _got_block_error(self, f): def _got_block_error(self, f):
level = log.WEIRD failtype = f.trap(DeadReferenceError, IntegrityCheckReject)
if f.check(DeadReferenceError): self.log("failure to get block", level=log.UNUSUAL, umid="5Z4uHQ")
level = log.UNUSUAL
self.log("BlockDownloader[%d] got error" % self.blocknum,
failure=f, level=level, umid="5Z4uHQ")
if self.results: if self.results:
peerid = self.vbucket.bucket.get_peerid() peerid = self.vbucket.bucket.get_peerid()
self.results.server_problems[peerid] = str(f) self.results.server_problems[peerid] = str(f)