ensure changing capacity changes the key as well

Author: sanderegg

packages/service-library/src/servicelib/redis/_semaphore.py

@@ -141,19 +141,25 @@ def __init__(self, **data) -> None:
     @property
     def semaphore_key(self) -> str:
         """Redis key for the semaphore sorted set."""
-        return f"{SEMAPHORE_KEY_PREFIX}{self.key}"
+        return f"{SEMAPHORE_KEY_PREFIX}{self.key}_cap{self.capacity}"
 
     @computed_field  # type: ignore[prop-decorator]
     @property
     def tokens_key(self) -> str:
         """Redis key for the token pool LIST."""
-        return f"{SEMAPHORE_KEY_PREFIX}{self.key}:tokens"
+        return f"{self.semaphore_key}:tokens"
 
     @computed_field  # type: ignore[prop-decorator]
     @property
     def holders_set(self) -> str:
         """Redis key for the holders SET."""
-        return f"{SEMAPHORE_KEY_PREFIX}{self.key}:holders_set"
+        return f"{self.semaphore_key}:holders_set"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def holder_key(self) -> str:
+        """Redis key for this instance's holder entry."""
+        return f"{self.semaphore_key}:holders:{self.instance_id}"
 
     @computed_field  # type: ignore[prop-decorator]
     @property
@@ -167,12 +173,6 @@ def tokens_set_ttl(self) -> datetime.timedelta:
         """TTL for the tokens SET"""
         return self.ttl * 5
 
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def holder_key(self) -> str:
-        """Redis key for this instance's holder entry."""
-        return f"{SEMAPHORE_KEY_PREFIX}{self.key}:holders:{self.instance_id}"
-
     @field_validator("ttl")
     @classmethod
     def validate_ttl(cls, v: datetime.timedelta) -> datetime.timedelta:

packages/service-library/tests/redis/test_semaphore.py

@@ -60,7 +60,10 @@ async def test_semaphore_initialization(
     assert semaphore.ttl == DEFAULT_SEMAPHORE_TTL
     assert semaphore.blocking is True
     assert semaphore.instance_id is not None
-    assert semaphore.semaphore_key == f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}"
+    assert (
+        semaphore.semaphore_key
+        == f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}_cap{semaphore_capacity}"
+    )
     assert semaphore.tokens_key.startswith(f"{semaphore.semaphore_key}:")
     assert semaphore.holders_set.startswith(f"{semaphore.semaphore_key}:")
     assert semaphore.holder_key.startswith(f"{semaphore.semaphore_key}:")

packages/service-library/tests/redis/test_semaphore_decorator.py

@@ -134,7 +134,7 @@ async def coro_that_should_fail() -> Literal["should not reach here"]:
 
     # Find and delete all holder keys for this semaphore
     holder_keys = await redis_client_sdk.redis.keys(
-        f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}:holders:*"
+        f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}_cap{semaphore_capacity}:holders:*"
     )
     assert holder_keys, "Holder keys should exist before deletion"
     await redis_client_sdk.redis.delete(*holder_keys)
@@ -734,7 +734,7 @@ async def use_failing_cm() -> None:
 
     # Find and delete all holder keys for this semaphore
     holder_keys = await redis_client_sdk.redis.keys(
-        f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}:holders:*"
+        f"{SEMAPHORE_KEY_PREFIX}{semaphore_name}_cap{semaphore_capacity}:holders:*"
     )
     assert holder_keys, "Holder keys should exist before deletion"
     await redis_client_sdk.redis.delete(*holder_keys)