From 8072c3e9ef5c6536900a941d7e1de4f636546c63 Mon Sep 17 00:00:00 2001 From: Phillip Shiu Date: Mon, 26 Jun 2023 12:44:18 -0400 Subject: [PATCH] temp: fix entitlements_to_expire should be capped at entitlements_count (#32579) --- .../management/commands/expire_and_create_entitlements.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/entitlements/management/commands/expire_and_create_entitlements.py b/common/djangoapps/entitlements/management/commands/expire_and_create_entitlements.py index 5497282eaa..482d8dc8fe 100644 --- a/common/djangoapps/entitlements/management/commands/expire_and_create_entitlements.py +++ b/common/djangoapps/entitlements/management/commands/expire_and_create_entitlements.py @@ -85,7 +85,7 @@ class Command(BaseCommand): entitlements_count = entitlements.count() logger.info('Total entitlements that have reached expiration period are %d ', entitlements_count) - entitlements_to_expire = max(1, options.get('count')) + entitlements_to_expire = min(max(1, options.get('count')), entitlements_count) batch_size = max(1, options.get('batch_size')) num_batches = ceil(entitlements_to_expire / batch_size) if entitlements else 0 @@ -100,7 +100,7 @@ class Command(BaseCommand): for batch_num in range(num_batches): start = batch_num * batch_size - end = min(start + batch_size, entitlements_to_expire, entitlements_count) + end = min(start + batch_size, entitlements_to_expire) entitlement_ids = [entitlement.id for entitlement in entitlements[start:end]] expire_and_create_entitlements.delay(entitlement_ids, support_username)