new cluster.addresses

CHANGELOG.md

@@ -1,5 +1,17 @@
 ### Upcoming
  - improvements to correlation self-tests
+ - you can add addresses to the (new) `[cluster.addresses]` section to specify IPs for pioreactors. Example:
+   ```
+
+  [cluster.addresses]
+  leader_hostname=pio00
+  leader_address=10.42.0.1
+
+  pio01_address=10.42.0.2
+  pio02_address=10.42.0.3
+
+   ```
+   Note that the leader is automatically added.
 
 ### 24.10.29
 

pioreactor/background_jobs/base.py

@@ -1096,10 +1096,10 @@ def _setup_actions(self, msg: pt.MQTTMessage) -> None:
         post_delay = self.get_from_config("post_delay_duration", cast=float, fallback=1.0)
         pre_delay = self.get_from_config("pre_delay_duration", cast=float, fallback=1.5)
 
-        if post_delay <= 0.25:
+        if post_delay < 0.25:
             self.logger.warning("For optimal OD readings, keep `post_delay_duration` more than 0.25 seconds.")
 
-        if pre_delay <= 0.25:
+        if pre_delay < 0.25:
             self.logger.warning("For optimal OD readings, keep `pre_delay_duration` more than 0.25 seconds.")
 
         def sneak_in(ads_interval, post_delay, pre_delay) -> None:

pioreactor/config.py

@@ -162,6 +162,10 @@ def get_config() -> ConfigParserMod:
     if "od_config.photodiode_channel" in config:
         config["od_config.photodiode_channel_reverse"] = config.invert_section("od_config.photodiode_channel")
 
+    # add this for hostname resolution using config.ini, see pioreactor.utils.networking.resolve_to_address
+    leader_hostname = config["cluster.topology"]["leader_hostname"]
+    config["cluster.addresses"][f"{leader_hostname}_address"] = config["cluster.topology"]["leader_address"]
+
     return config
 
 

pioreactor/utils/networking.py

@@ -8,6 +8,7 @@
 from threading import Thread
 from typing import Generator
 
+from pioreactor.config import config
 from pioreactor.exc import RsyncError
 
 
@@ -146,7 +147,11 @@ def worker_hostnames(queue: Queue) -> None:
 def resolve_to_address(hostname: str) -> str:
     # TODO: make this more fleshed out: resolve to IP, etc.
     # add_local assumes a working mDNS.
-    return add_local(hostname)
+    address_in_config = config.get("cluster.addresses", f"{hostname}_address", fallback=None)
+    if address_in_config is not None:
+        return address_in_config
+    else:
+        return add_local(hostname)
 
 
 def add_local(hostname: str) -> str:

pioreactor/utils/pwm.py

@@ -108,8 +108,7 @@ def dc(self, dc: pt.FloatBetween0and100) -> None:
         if self._started:
             try:
                 lgpio.tx_pwm(self._handle, self.pin, self.frequency, self.dc)
-            except lgpio.error as e:
-                print(e)
+            except lgpio.error:
                 pass
 
         else: