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

hew closer to security/master version of these lines

Browse Source
This commit is contained in:
Jean-Paul Calderone 2021-12-06 12:47:37 -05:00
parent a8bdb8dcbb
commit 5f6579d446
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/storage/server.py
View File

@ -334,9 +334,8 @@ class StorageServer(service.MultiService, Referenceable):
# file, they'll want us to hold leases for this file.
for (shnum, fn) in self._get_bucket_shares(storage_index):
alreadygot[shnum] = ShareFile(fn)
if renew_leases:
sf = ShareFile(fn)
sf.add_or_renew_lease(remaining_space, lease_info)
if renew_leases:
self._add_or_renew_leases(alreadygot.values(), lease_info)
for shnum in sharenums:
incominghome = os.path.join(self.incomingdir, si_dir, "%d" % shnum)
@ -409,8 +408,10 @@ class StorageServer(service.MultiService, Referenceable):
lease_info = LeaseInfo(owner_num,
renew_secret, cancel_secret,
new_expire_time, self.my_nodeid)
for sf in self._iter_share_files(storage_index):
sf.add_or_renew_lease(self.get_available_space(), lease_info)
self._add_or_renew_leases(
self._iter_share_files(storage_index),
lease_info,
)
self.add_latency("add-lease", self._clock.seconds() - start)
return None