Fixing test issues by reframing connect.

Author: sriroopar

ols/runners/quota_scheduler.py

@@ -32,8 +32,8 @@
 # Reconciliation SQL for user quotas - updates all user rows
 RECONCILE_USER_QUOTA_LIMITS_STATEMENT = """
     UPDATE quota_limits
-       SET quota_limit = %s,
-           available = available + (%s - quota_limit),
+       SET available = available + (%s - quota_limit),
+           quota_limit = %s,
            updated_at = NOW()
      WHERE subject = 'u'
        AND quota_limit != %s
@@ -43,8 +43,8 @@
 # Reconciliation SQL for cluster quotas - updates cluster row
 RECONCILE_CLUSTER_QUOTA_LIMITS_STATEMENT = """
     UPDATE quota_limits
-       SET quota_limit = %s,
-           available = available + (%s - quota_limit),
+       SET available = available + (%s - quota_limit),
+           quota_limit = %s,
            updated_at = NOW()
      WHERE subject = 'c'
        AND quota_limit != %s
@@ -203,8 +203,8 @@ def reconcile_quota_limits(
             cursor.execute(
                 reconcile_sql,
                 (
-                    new_quota,  # new quota_limit value
                     new_quota,  # used in calculation: available + (new - old)
+                    new_quota,  # new quota_limit value to set
                     new_quota,  # WHERE quota_limit != ?
                 ),
             )

ols/src/quota/quota_limiter_factory.py

@@ -6,6 +6,7 @@
 from ols.app.models.config import PostgresConfig, QuotaHandlersConfig
 from ols.src.quota.cluster_quota_limiter import ClusterQuotaLimiter
 from ols.src.quota.quota_limiter import QuotaLimiter
+from ols.src.quota.revokable_quota_limiter import RevokableQuotaLimiter
 from ols.src.quota.user_quota_limiter import UserQuotaLimiter
 
 logger = logging.getLogger(__name__)
@@ -42,6 +43,8 @@ def quota_limiters(config: QuotaHandlersConfig) -> list[QuotaLimiter]:
             limiter = QuotaLimiterFactory.create_limiter(
                 storage_config, limiter_type, initial_quota, increase_by
             )
+            if isinstance(limiter, RevokableQuotaLimiter):
+                limiter.reconcile_quota_limits()
             limiters.append(limiter)
             logger.info("Set up quota limiter '%s'", name)
         return limiters

ols/src/quota/revokable_quota_limiter.py

@@ -52,8 +52,8 @@ class RevokableQuotaLimiter(QuotaLimiter):
     # Reconciliation SQL for user quotas - updates all user rows
     RECONCILE_USER_QUOTA_LIMITS = """
         UPDATE quota_limits
-           SET quota_limit = %s,
-               available = available + (%s - quota_limit),
+           SET available = available + (%s - quota_limit),
+               quota_limit = %s,
                updated_at = NOW()
          WHERE subject = 'u'
            AND quota_limit != %s
@@ -63,8 +63,8 @@ class RevokableQuotaLimiter(QuotaLimiter):
     # Reconciliation SQL for cluster quotas - updates cluster row
     RECONCILE_CLUSTER_QUOTA_LIMITS = """
         UPDATE quota_limits
-           SET quota_limit = %s,
-               available = available + (%s - quota_limit),
+           SET available = available + (%s - quota_limit),
+               quota_limit = %s,
                updated_at = NOW()
          WHERE subject = 'c'
            AND quota_limit != %s
@@ -84,20 +84,18 @@ def __init__(
         self.increase_by = increase_by
         self.connection_config = connection_config
 
-    def connect(self) -> None:
-        """Initialize connection to database and reconcile quota limits.
+    def reconcile_quota_limits(self) -> None:
+        """Reconcile quota limits with current configuration.
 
-        Reconciliation ensures database quota limits match OLSConfig after updates.
-        This happens on first request after config changes, ensuring immediate sync.
-        The quota_scheduler also runs reconciliation periodically as a backup.
+        Public method to trigger reconciliation after initialization.
+        Should be called after quota limiters are created to ensure
+        database quota limits match OLSConfig after updates.
         """
-        super().connect()
-        # Reconcile on connect so changes take effect on first request after OLSConfig update
         try:
             self._reconcile_quota_limits()
         except Exception as e:
             logger.warning(
-                "Quota reconciliation on connect failed (will retry on scheduler): %s", e
+                "Quota reconciliation failed (will retry on scheduler): %s", e
             )
 
     @connection
@@ -232,8 +230,8 @@ def _reconcile_quota_limits(self) -> None:
                 cursor.execute(
                     reconcile_sql,
                     (
-                        self.initial_quota,  # new quota_limit
                         self.initial_quota,  # used in calculation: available + (new - old)
+                        self.initial_quota,  # new quota_limit to set
                         self.initial_quota,  # WHERE quota_limit != ?
                     ),
                 )

ols/utils/config.py

@@ -83,9 +83,12 @@ def conversation_cache(self) -> Cache:
     def quota_limiters(self) -> list[QuotaLimiter]:
         """Return all quota limiters."""
         if self._quota_limiters is None:
-            self._quota_limiters = QuotaLimiterFactory.quota_limiters(
-                self.ols_config.quota_handlers
-            )
+            if self.ols_config.quota_handlers is not None:
+                self._quota_limiters = QuotaLimiterFactory.quota_limiters(
+                    self.ols_config.quota_handlers
+                )
+            else:
+                self._quota_limiters = []
         return self._quota_limiters
 
     @property