11507: Put self._pending_write_size update back under the lock.

[arvados.git] / sdk / python / arvados / arvfile.py

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index c41a45f30c25ec590ffd84d93c6ae64cee1c4884..64e0f052802f95efa60900dd81075a2288033888 100644 (file)
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -585,17 +585,18 @@ class _BlockManager(object):
 
     def repack_small_blocks(self, force=False, sync=False, closed_file_size=0):
         """Packs small blocks together before uploading"""
-        self._pending_write_size += closed_file_size
 
-        # Check if there are enough small blocks for filling up one in full
-        if not (force or (self._pending_write_size >= config.KEEP_BLOCK_SIZE)):
-            return
-
-        # Search blocks ready for getting packed together before being committed to Keep.
-        # A WRITABLE block always has an owner.
-        # A WRITABLE block with its owner.closed() implies that it's
-        # size is <= KEEP_BLOCK_SIZE/2.
         with self.lock:
+            self._pending_write_size += closed_file_size
+
+            # Check if there are enough small blocks for filling up one in full
+            if not (force or (self._pending_write_size >= config.KEEP_BLOCK_SIZE)):
+                return
+
+            # Search blocks ready for getting packed together before being committed to Keep.
+            # A WRITABLE block always has an owner.
+            # A WRITABLE block with its owner.closed() implies that it's
+            # size is <= KEEP_BLOCK_SIZE/2.
             bufferblocks = self._bufferblocks.values()
 
         try: