From 2cd5d75a2e913a0adf5c58e34d75a172a5e1f394 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Mon, 16 Aug 2021 17:02:13 -0400 Subject: [PATCH] return true/false if clean was performed --- lbry/blob/disk_space_manager.py | 5 ++++- tests/unit/blob/test_disk_space_manager.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lbry/blob/disk_space_manager.py b/lbry/blob/disk_space_manager.py index 7ef7a3889..67e8cda2b 100644 --- a/lbry/blob/disk_space_manager.py +++ b/lbry/blob/disk_space_manager.py @@ -28,7 +28,7 @@ class DiskSpaceManager: def clean(self): if not self.config.blob_storage_limit: - return + return False used = 0 files = [] data_dir = os.path.join(self.config.data_dir, 'blobfiles') @@ -39,11 +39,14 @@ class DiskSpaceManager: files.append((file_stats.st_mtime, file_stats.st_size, file.path)) files.sort() available = (self.config.blob_storage_limit*1024*1024) - used + cleaned = False for _, file_size, file in files: available += file_size if available > 0: break os.remove(file) + cleaned = True + return cleaned async def cleaning_loop(self): while self.running: diff --git a/tests/unit/blob/test_disk_space_manager.py b/tests/unit/blob/test_disk_space_manager.py index 32237ff09..54871f092 100644 --- a/tests/unit/blob/test_disk_space_manager.py +++ b/tests/unit/blob/test_disk_space_manager.py @@ -24,6 +24,7 @@ class ConfigurationTests(unittest.TestCase): with open(os.path.join(config.data_dir, 'blobfiles', f'3mb-{file_no}'), 'w') as blob: blob.write('0' * 1 * 1024 * 1024) self.assertEqual(10, dsm.space_used_mb) - dsm.clean() + self.assertTrue(dsm.clean()) self.assertEqual(5, dsm.space_used_mb) + self.assertFalse(dsm.clean())