rename some env variable

Author: francesconazzaro

cads_broker/config.py

@@ -30,12 +30,12 @@ class BrokerConfig(pydantic_settings.BaseSettings):
     high_priority_user_uid: str = "8d8ee054-6a09-4da8-a5be-d5dff52bbc5f"
     broker_priority_algorithm: str = "legacy"
     broker_priority_interval_hours: int = 24
-    get_number_of_workers_cache_time: int = 10
-    qos_rules_cache_time: int = 10
-    get_tasks_from_scheduler_cache_time: int = 1
-    rules_path: str = "/src/rules.qos"
-    wait_time: float = 2.
-    sync_database_cache_time: int = 10
+    broker_get_number_of_workers_cache_time: int = 10
+    broker_qos_rules_cache_time: int = 10
+    broker_get_tasks_from_scheduler_cache_time: int = 1
+    broker_rules_path: str = "/src/rules.qos"
+    broker_wait_time: float = 2.
+    broker_sync_database_cache_time: int = 10
     broker_requeue_on_killed_worker_requests: bool = False
     broker_requeue_on_lost_requests: bool = True
     broker_requeue_limit: int = 3

cads_broker/dispatcher.py

@@ -43,7 +43,7 @@
 
 @cachetools.cached(  # type: ignore
     cache=cachetools.TTLCache(
-        maxsize=1024, ttl=CONFIG.get_number_of_workers_cache_time
+        maxsize=1024, ttl=CONFIG.broker_get_number_of_workers_cache_time
     ),
     info=True,
 )
@@ -56,7 +56,7 @@ def get_number_of_workers(client: distributed.Client) -> int:
 
 
 @cachetools.cached(  # type: ignore
-    cache=cachetools.TTLCache(maxsize=1024, ttl=CONFIG.qos_rules_cache_time),
+    cache=cachetools.TTLCache(maxsize=1024, ttl=CONFIG.broker_qos_rules_cache_time),
     info=True,
 )
 def get_rules_hash(rules_path: str):
@@ -70,7 +70,7 @@ def get_rules_hash(rules_path: str):
 
 @cachetools.cached(  # type: ignore
     cache=cachetools.TTLCache(
-        maxsize=1024, ttl=CONFIG.get_tasks_from_scheduler_cache_time
+        maxsize=1024, ttl=CONFIG.broker_get_tasks_from_scheduler_cache_time
     ),
     info=True,
 )
@@ -188,7 +188,7 @@ def reset(self) -> None:
 class QoSRules:
     def __init__(self, number_of_workers) -> None:
         self.environment = Environment.Environment(number_of_workers=number_of_workers)
-        self.rules_path = CONFIG.rules_path
+        self.rules_path = CONFIG.broker_rules_path
         if os.path.exists(self.rules_path):
             self.rules = self.rules_path
         else:
@@ -206,9 +206,9 @@ class Broker:
     address: str
     session_maker_read: sa.orm.sessionmaker
     session_maker_write: sa.orm.sessionmaker
-    wait_time: float = CONFIG.wait_time
+    wait_time: float = CONFIG.broker_wait_time
     ttl_cache = cachetools.TTLCache(
-        maxsize=1024, ttl=CONFIG.sync_database_cache_time
+        maxsize=1024, ttl=CONFIG.broker_sync_database_cache_time
     )
 
     futures: dict[str, distributed.Future] = attrs.field(