mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-03-25 05:05:16 +00:00
client.py: throw error when reserved_space= is unparseable. Closes #1812.
This should now fail quickly (during "tahoe start"). Previously this would silently treat an unparseable size as "0", and the only way to discover that it had had a problem would be to look at the foolscap log, or examine the storage-service web page for the unexpected "Reserved Size" number.
This commit is contained in:
parent
0a89b738bc
commit
b084396bdd
@ -257,12 +257,12 @@ class Client(node.Node, pollmixin.PollMixin):
|
||||
storedir = os.path.join(self.basedir, self.STOREDIR)
|
||||
|
||||
data = self.get_config("storage", "reserved_space", None)
|
||||
reserved = None
|
||||
try:
|
||||
reserved = parse_abbreviated_size(data)
|
||||
except ValueError:
|
||||
log.msg("[storage]reserved_space= contains unparseable value %s"
|
||||
% data)
|
||||
raise
|
||||
if reserved is None:
|
||||
reserved = 0
|
||||
discard = self.get_config("storage", "debug_discard", False,
|
||||
|
@ -132,8 +132,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
|
||||
"[storage]\n" + \
|
||||
"enabled = true\n" + \
|
||||
"reserved_space = bogus\n")
|
||||
c = client.Client(basedir)
|
||||
self.failUnlessEqual(c.getServiceNamed("storage").reserved_space, 0)
|
||||
self.failUnlessRaises(ValueError, client.Client, basedir)
|
||||
|
||||
def _permute(self, sb, key):
|
||||
return [ s.get_longname() for s in sb.get_servers_for_psi(key) ]
|
||||
|
Loading…
x
Reference in New Issue
Block a user