diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index 8cd9b7599bc650c7df37ee2e8031b788f6df7137..e535ff6412844db1b5a29a3f0c96a140ced50cf7 100644
--- a/src/_zkapauthorizer/_storage_server.py
+++ b/src/_zkapauthorizer/_storage_server.py
@@ -283,10 +283,11 @@ class ZKAPAuthorizerStorageServer(Referenceable):
get_share_sizes(self._original, storage_index_or_slot, sharenums)
)
- def remote_stat_shares(self, storage_indexes_or_slots):
+ def remote_stat_shares(self, storage_indexes):
+ # type: (List[bytes]) -> List[Dict[int, ShareStat]]
return list(
- dict(stat_share(self._original, storage_index_or_slot))
- for storage_index_or_slot in storage_indexes_or_slots
+ dict(stat_share(self._original, storage_index))
+ for storage_index in storage_indexes
)
def remote_slot_testv_and_readv_and_writev(
diff --git a/src/_zkapauthorizer/tests/matchers.py b/src/_zkapauthorizer/tests/matchers.py
index 4bfe7362bcfa96eb3198cb7ef6cc0ca3b0e9ea90..2c90d8e74457d3a196de64dce3743db381570776 100644
--- a/src/_zkapauthorizer/tests/matchers.py
+++ b/src/_zkapauthorizer/tests/matchers.py
@@ -140,8 +140,9 @@ def leases_current(relevant_storage_indexes, now, min_lease_remaining):
# visited and maintained.
lambda storage_server: list(
stat
- for (storage_index, stat) in storage_server.buckets.items()
+ for (storage_index, shares) in storage_server.buckets.items()
if storage_index in relevant_storage_indexes
+ for (sharenum, stat) in shares.items()
),
AllMatch(
AfterPreprocessing(
diff --git a/src/_zkapauthorizer/tests/test_lease_maintenance.py b/src/_zkapauthorizer/tests/test_lease_maintenance.py
index 2a8743dda3fbf6298f316928f093dd3ce3df5b64..ae934ad8bb6bad8840268871f620920f3239f54d 100644
--- a/src/_zkapauthorizer/tests/test_lease_maintenance.py
+++ b/src/_zkapauthorizer/tests/test_lease_maintenance.py
@@ -34,7 +34,9 @@ from hypothesis.strategies import (
floats,
integers,
just,
+ tuples,
lists,
+ sets,
randoms,
)
from testtools import TestCase
@@ -64,7 +66,7 @@ from ..lease_maintenance import (
visit_storage_indexes_from_root,
)
from .matchers import Provides, between, leases_current
-from .strategies import clocks, leaf_nodes, node_hierarchies, storage_indexes
+from .strategies import clocks, node_hierarchies, storage_indexes, sharenums
def interval_means():
@@ -93,18 +95,19 @@ class DummyStorageServer(object):
"""
A dummy implementation of ``IStorageServer`` from Tahoe-LAFS.
- :ivar dict[bytes, ShareStat] buckets: A mapping from storage index to
+ :ivar buckets: A mapping from storage index to
metadata about shares at that storage index.
"""
clock = attr.ib()
- buckets = attr.ib()
+ buckets = attr.ib() # type: Dict[bytes, Dict[int, ShareStat]]
lease_seed = attr.ib()
def stat_shares(self, storage_indexes):
+ # type: (List[bytes]) -> Deferred[List[Dict[int, ShareStat]]]
return succeed(
list(
- {0: self.buckets[idx]} if idx in self.buckets else {}
+ self.buckets.get(idx, {})
for idx in storage_indexes
)
)
@@ -113,21 +116,24 @@ class DummyStorageServer(object):
return self.lease_seed
def add_lease(self, storage_index, renew_secret, cancel_secret):
- self.buckets[storage_index].lease_expiration = (
- self.clock.seconds() + timedelta(days=31).total_seconds()
- )
+ for stat in self.buckets.get(storage_index, {}).values():
+ stat.lease_expiration = (
+ self.clock.seconds() + timedelta(days=31).total_seconds()
+ )
class SharesAlreadyExist(Exception):
pass
-def create_shares(storage_server, storage_index, size, lease_expiration):
+def create_share(storage_server, storage_index, sharenum, size, lease_expiration):
+ # type: (DummyStorageServer, bytes, int, int, int) -> None
"""
- Initialize a storage index ("bucket") with some shares.
+ Add a share to a storage index ("bucket").
:param DummyServer storage_server: The server to populate with shares.
:param bytes storage_index: The storage index of the shares.
+ :param sharenum: The share number to add.
:param int size: The application data size of the shares.
:param int lease_expiration: The expiration time for the lease to attach
to the shares.
@@ -137,11 +143,12 @@ def create_shares(storage_server, storage_index, size, lease_expiration):
:return: ``None``
"""
- if storage_index in storage_server.buckets:
+ if sharenum in storage_server.buckets.get(storage_index, {}):
raise SharesAlreadyExist(
"Cannot create shares for storage index where they already exist.",
)
- storage_server.buckets[storage_index] = ShareStat(
+ bucket = storage_server.buckets.setdefault(storage_index, {})
+ bucket[sharenum] = ShareStat(
size=size,
lease_expiration=lease_expiration,
)
@@ -166,7 +173,7 @@ def storage_servers(clocks):
return builds(
DummyStorageServer,
clocks,
- dictionaries(storage_indexes(), share_stats()),
+ dictionaries(storage_indexes(), dictionaries(sharenums(), share_stats())),
lease_seeds(),
).map(
DummyServer,
@@ -425,13 +432,38 @@ class VisitStorageIndexesFromRootTests(TestCase):
)
+def lists_of_buckets():
+ """
+ Build lists of bucket descriptions.
+
+ A bucket description is a two-tuple of a storage index and a set of share
+ numbers. Any given storage index will appear only once in the overall
+ result.
+ """
+ def buckets_strategy(count):
+ si_strategy = sets(storage_indexes(), min_size=count, max_size=count)
+ sharenum_strategy = lists(
+ sets(sharenums(), min_size=1),
+ min_size=count,
+ max_size=count,
+ )
+ return builds(
+ zip,
+ si_strategy,
+ sharenum_strategy,
+ )
+
+ bucket_count_strategy = integers(min_value=0, max_value=100)
+ return bucket_count_strategy.flatmap(buckets_strategy)
+
+
class RenewLeasesTests(TestCase):
"""
Tests for ``renew_leases``.
"""
- @given(storage_brokers(clocks()), lists(leaf_nodes(), unique=True))
- def test_renewed(self, storage_broker, nodes):
+ @given(storage_brokers(clocks()), lists_of_buckets())
+ def test_renewed(self, storage_broker, buckets):
"""
``renew_leases`` renews the leases of shares on all storage servers which
have no more than the specified amount of time remaining on their
@@ -445,18 +477,20 @@ class RenewLeasesTests(TestCase):
# Make sure that the storage brokers have shares at the storage
# indexes we're going to operate on.
for storage_server in storage_broker.get_connected_servers():
- for node in nodes:
- try:
- create_shares(
- storage_server.get_storage_server(),
- node.get_storage_index(),
- size=123,
- lease_expiration=int(storage_broker.clock.seconds()),
- )
- except SharesAlreadyExist:
- # If Hypothesis already put some shares in this storage
- # index, that's okay too.
- pass
+ for (storage_index, sharenums) in buckets:
+ for sharenum in sharenums:
+ try:
+ create_share(
+ storage_server.get_storage_server(),
+ storage_index,
+ sharenum,
+ size=123,
+ lease_expiration=int(storage_broker.clock.seconds()),
+ )
+ except SharesAlreadyExist:
+ # If the storage_brokers() strategy already put a
+ # share at this location, that's okay too.
+ pass
def get_now():
return datetime.utcfromtimestamp(
@@ -464,8 +498,8 @@ class RenewLeasesTests(TestCase):
)
def visit_assets(visit):
- for node in nodes:
- visit(node.get_storage_index())
+ for storage_index, ignored in buckets:
+ visit(storage_index)
return succeed(None)
d = renew_leases(
@@ -481,8 +515,6 @@ class RenewLeasesTests(TestCase):
succeeded(Always()),
)
- relevant_storage_indexes = set(node.get_storage_index() for node in nodes)
-
self.assertThat(
list(
server.get_storage_server()
@@ -490,7 +522,7 @@ class RenewLeasesTests(TestCase):
),
AllMatch(
leases_current(
- relevant_storage_indexes,
+ list(storage_index for (storage_index, ignored) in buckets),
get_now(),
min_lease_remaining,
)
@@ -590,12 +622,11 @@ class MaintainLeasesFromRootTests(TestCase):
for node in root_node.flatten():
for server in storage_broker.get_connected_servers():
try:
- stat = server.get_storage_server().buckets[node.get_storage_index()]
+ shares = server.get_storage_server().buckets[node.get_storage_index()]
except KeyError:
continue
else:
- # DummyStorageServer always pretends to have only one share
- expected.append([stat.size])
+ expected.extend(stat.size for stat in shares.values())
# The visit order doesn't matter.
expected.sort()