Changeset 4defc641 in trunk

Timestamp:

2021-10-22T19:56:45Z (3 years ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

e0ed04c

Parents:

1264c3be

git-author:

Jean-Paul Calderone <exarkun@…> (2021-10-20 18:36:05)

git-committer:

Jean-Paul Calderone <exarkun@…> (2021-10-22 19:56:45)

Message:

Have ShareFile? only write a new lease if there is room for it

StorageServer? passes available space down so it can make the decision.
ShareFile? has to do it because add_or_renew_lease only *sometimes* adds a
lease and only ShareFile? knows when that is.

Location:

src/allmydata/storage

Files:

• immutable.py (modified) (2 diffs)
• server.py (modified) (1 diff)

src/allmydata/storage/immutable.py ¶

@@ -22 +22 @@
     RIBucketWriter, RIBucketReader, ConflictingWriteError,
     DataTooLargeError,
+    NoSpace,
 )
 from allmydata.util import base32, fileutil, log
@@ -250 +251 @@
         raise IndexError("unable to renew non-existent lease")
 
-    def add_or_renew_lease(self, lease_info):
+    def add_or_renew_lease(self, available_space, lease_info):
+        """
+        Renew an existing lease if possible, otherwise allocate a new one.
+
+        :param int available_space: The maximum number of bytes of storage to
+            commit in this operation.  If more than this number of bytes is
+            required, raise ``NoSpace`` instead.
+
+        :param LeaseInfo lease_info: The details of the lease to renew or add.
+
+        :raise NoSpace: If more than ``available_space`` bytes is required to
+            complete the operation.  In this case, no lease is added.
+
+        :return: ``None``
+        """
         try:
             self.renew_lease(lease_info.renew_secret,
                              lease_info.expiration_time)
         except IndexError:
+            if lease_info.immutable_size() > available_space:
+                raise NoSpace()
             self.add_lease(lease_info)
-
 
     def cancel_lease(self, cancel_secret):

src/allmydata/storage/server.py ¶

@@ -619 +619 @@
         """
         for share in shares:
-            share.add_or_renew_lease(lease_info)
+            share.add_or_renew_lease(self.get_available_space(), lease_info)
 
     def slot_testv_and_readv_and_writev(  # type: ignore # warner/foolscap#78