ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

servermap: don't log late arrivals, and don't log DeadReferenceError at log.WEIRD

Browse Source
This commit is contained in:
Brian Warner 2008-08-26 17:37:29 -07:00
parent 1668401c16
commit 3b06aa6a79
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/allmydata/mutable/servermap.py
View File

@ -4,6 +4,7 @@ from zope.interface import implements
from itertools import count from itertools import count
from twisted.internet import defer from twisted.internet import defer
from twisted.python import failure from twisted.python import failure
from foolscap import DeadReferenceError
from foolscap.eventual import eventually from foolscap.eventual import eventually
from allmydata.util import base32, hashutil, idlib, log from allmydata.util import base32, hashutil, idlib, log
from allmydata import storage from allmydata import storage
@ -695,11 +696,14 @@ class ServermapUpdater:
def _query_failed(self, f, peerid): def _query_failed(self, f, peerid):
self.log(format="error during query: %(f_value)s",
f_value=str(f.value), failure=f,
level=log.WEIRD, umid="IHXuQg")
if not self._running: if not self._running:
return return
level = log.WEIRD
if f.check(DeadReferenceError):
level = log.UNUSUAL
self.log(format="error during query: %(f_value)s",
f_value=str(f.value), failure=f,
level=level, umid="IHXuQg")
self._must_query.discard(peerid) self._must_query.discard(peerid)
self._queries_outstanding.discard(peerid) self._queries_outstanding.discard(peerid)
self._bad_peers.add(peerid) self._bad_peers.add(peerid)
@ -725,12 +729,14 @@ class ServermapUpdater:
def _privkey_query_failed(self, f, peerid, shnum, lp): def _privkey_query_failed(self, f, peerid, shnum, lp):
self._queries_outstanding.discard(peerid) self._queries_outstanding.discard(peerid)
self.log(format="error during privkey query: %(f_value)s",
f_value=str(f.value), failure=f,
parent=lp, level=log.WEIRD, umid="McoJ5w")
if not self._running: if not self._running:
return return
self._queries_outstanding.discard(peerid) level = log.WEIRD
if f.check(DeadReferenceError):
level = log.UNUSUAL
self.log(format="error during privkey query: %(f_value)s",
f_value=str(f.value), failure=f,
parent=lp, level=level, umid="McoJ5w")
self._servermap.problems.append(f) self._servermap.problems.append(f)
self._last_failure = f self._last_failure = f