rosotacom-dev 2.5.dev82__py3-none-any.whl → 2.5.dev84__py3-none-any.whl

rosotacom/cli.py

@@ -2437,9 +2437,19 @@ def _ota_stop_parts(
 #: How a benchmark's load maps onto `publish-test-topics` flags. The keys are
 #: `_sized_publisher_param_args`'s own, so a load dict travels from the
 #: benchmark to the peer's publisher without being rewritten on the way.
+#:
+#: `size_pattern` and not `pattern`, and that distinction is the whole reason a
+#: mixed-size load never reached a peer. `parse_size_pattern_load` turns one CLI
+#: string into five keys -- `sizes`, `pattern`, `size_pattern`, and one
+#: `size_<label>` per distinct size -- and only three of them used to cross the
+#: hop. A two-size pattern therefore arrived as `pattern=a*6,b*1` with `size_a`
+#: and no `size_b`, and the publisher died on `Pattern references size 'b' but
+#: it was not provided` inside a detached `docker exec`, which the orchestrator
+#: reported as the topic not advertising. Sending the *source* string instead
+#: cannot lose a size, whatever the pattern turns out to contain.
 _OTA_LOAD_FLAGS: tuple[tuple[str, str], ...] = (
     ("size", "--load-size"),
-    ("pattern", "--load-size-pattern"),
+    ("size_pattern", "--load-size-pattern"),
     ("rate", "--load-rate-hz"),
     ("streams", "--load-streams"),
     ("interval_jitter_ms", "--load-interval-jitter-ms"),
@@ -2469,6 +2479,16 @@ def _ota_publish_parts(
         merged = dict(load or {})
         if "size" not in merged and merged.get("size_a") is not None:
             merged["size"] = merged["size_a"]
+        if merged.get("pattern") and not merged.get("size_pattern"):
+            # Only `parse_size_pattern_load` produces `pattern`, and it always
+            # produces `size_pattern` beside it. A load carrying one without the
+            # other was assembled by hand, and sending the expanded form would
+            # drop every size but the first -- loudly here rather than as a peer
+            # whose publisher will not start.
+            raise RuntimeError(
+                f"load carries pattern {merged['pattern']!r} without the size pattern it came from; "
+                "build it with parse_size_pattern_load so every size reaches the peer."
+            )
         for key, flag in _OTA_LOAD_FLAGS:
             if merged.get(key) is not None:
                 parts.extend([flag, str(merged[key])])
@@ -7158,9 +7178,27 @@ def _smoke_local_domain_id(cfg: dict[str, Any], receiver_peer_key: str) -> str |
     return str(session_gen._parse_optional_domain_id(domain_id, f"peer_settings.{receiver_peer_key}.domain_id"))
 
 
+#: The OTA Cyclone template that carries the local domain as well (#323). A
+#: session on it renders no local profile at all: its local-domain processes
+#: read the OTA file, so that is the file a smoke or probe publisher has to read.
+SCOPED_CYCLONE_OTA_TEMPLATE = "cyclonedds_scoped.xml"
+
+
 def _smoke_local_config_commands(config_container_dir: str, cfg: dict[str, Any], receiver_peer_key: str) -> list[str]:
-    local = _smoke_rmw_spec(cfg).local
+    """The DDS environment a publisher on the local domain needs to be heard.
+
+    It has to be the configuration the session's own local-domain processes use.
+    On CycloneDDS 11 two participants with different configurations on one host
+    and one domain discover and match each other and deliver nothing, so a
+    publisher on the inline default beside a session on the scoped file is heard
+    by its own `ros2 topic list` and by nothing in the session (#346).
+    """
+    spec = _smoke_rmw_spec(cfg)
+    local = spec.local
     if not local.dds_config:
+        if spec.ota.impl == "cyclone" and spec.ota.dds_config == SCOPED_CYCLONE_OTA_TEMPLATE:
+            scoped_file = f"{config_container_dir}/{receiver_peer_key}/ota_dds.xml"
+            return [f"export CYCLONEDDS_URI={shlex.quote(f'file://{scoped_file}')}"]
         return []
     config_file = f"{config_container_dir}/{receiver_peer_key}/local_dds.xml"
     if local.impl == "cyclone":
@@ -7580,6 +7618,33 @@ def _smoke_publish_specs(cfg: dict[str, Any], source_peer_key: str | None = None
     return specs
 
 
+#: Where a detached smoke publisher's own output goes inside its container.
+#: `docker exec -d` returns before the process says anything and keeps nothing,
+#: so without this the only evidence of a publisher that refused to start is the
+#: topic never appearing -- which reads as a broken graph rather than as a bad
+#: parameter. One file per topic, overwritten per attempt.
+_SMOKE_PUBLISHER_LOG_DIR = "/tmp"
+
+
+def _smoke_publisher_log_path(topic: str) -> str:
+    slug = re.sub(r"[^A-Za-z0-9]+", "_", topic).strip("_") or "topic"
+    return f"{_SMOKE_PUBLISHER_LOG_DIR}/rosotacom-smoke-publisher-{slug}.log"
+
+
+def _smoke_publisher_failure_detail(container: str, log_path: str) -> str:
+    """What the publisher said before it stopped, if it said anything."""
+    result = subprocess.run(
+        ["docker", "exec", container, "tail", "-n", "20", log_path],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    detail = ((result.stdout or "") + (result.stderr or "")).strip()
+    if not detail:
+        return f" Nothing was written to {log_path} in the container, so it never got as far as starting."
+    return f"\nWhat it wrote to {log_path}:\n{detail}"
+
+
 def _start_smoke_topic_publishers(
     containers: dict[str, str],
     ros_setups: dict[str, str],
@@ -7606,8 +7671,9 @@ def _start_smoke_topic_publishers(
             f"Starting smoke publisher {spec.source_peer_key}->{spec.receiver_peer_key} "
             f"{spec.publish_topic} ({spec.publish_type}) in {container}{offered}"
         )
+        log_path = _smoke_publisher_log_path(spec.publish_topic)
         subprocess.run(
-            ["docker", "exec", "-d", container, "bash", "-c", cmd],
+            ["docker", "exec", "-d", container, "bash", "-c", f"{{ {cmd} ; }} > {shlex.quote(log_path)} 2>&1"],
             capture_output=True,
             text=True,
             check=False,
@@ -7626,6 +7692,7 @@ def _start_smoke_topic_publishers(
             raise RuntimeError(
                 f"Smoke publisher {spec.source_peer_key}->{spec.receiver_peer_key} "
                 f"{spec.publish_topic} ({spec.publish_type}) did not advertise in {container}."
+                + _smoke_publisher_failure_detail(container, log_path)
             )
     return started
 
@@ -7981,7 +8048,21 @@ def _publish_load_override(args: argparse.Namespace) -> dict[str, Any] | None:
         load["size"] = int(args.load_size)
         load["size_a"] = int(args.load_size)
     if getattr(args, "load_size_pattern", None):
-        load["pattern"] = args.load_size_pattern
+        # Re-derived here rather than carried in pieces: the orchestrator sends
+        # the pattern it was given, and this side expands it into `sizes`,
+        # `pattern` and every `size_<label>` the publisher needs. `size_a` from
+        # `--load-size` above is overwritten on purpose -- a pattern names its
+        # own sizes, and the scalar is only a fallback for callers without one.
+        from .benchmark import parse_size_pattern_load
+
+        try:
+            load.update(parse_size_pattern_load(str(args.load_size_pattern)))
+        except ValueError as error:
+            raise RuntimeError(
+                f"--load-size-pattern {args.load_size_pattern!r} is not a size pattern ({error}). "
+                "An orchestrator older than this peer sends the expanded token form here instead of the "
+                "pattern; the two sides have to agree, so bring them to the same rosotacom."
+            ) from error
     if getattr(args, "load_rate_hz", None) is not None:
         load["rate"] = float(args.load_rate_hz)
     if getattr(args, "load_streams", None) is not None:

{rosotacom_dev-2.5.dev82.dist-info → rosotacom_dev-2.5.dev84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rosotacom-dev
-Version: 2.5.dev82
+Version: 2.5.dev84
 Summary: Host CLI for ROS OTA communication sessions.
 Author: develNor
 License-Expression: BSD-3-Clause

{rosotacom_dev-2.5.dev82.dist-info → rosotacom_dev-2.5.dev84.dist-info}/RECORD

@@ -6,7 +6,7 @@ rosotacom/benched_set.py,sha256=lBA1Rj04dbr2e-lIvYTWoL55_LdUpCAC-y7eIvJZ8lc,2721
 rosotacom/benchmark.py,sha256=3QoXJtWUGQPwvDWyQT_fOjx6K9G2pmvtnVurA21G2QY,76612
 rosotacom/benchmark_delta.py,sha256=qXzriBkbXOeJdlLKM4ziov1F-JfwlseYHE48S9hjFsQ,10005
 rosotacom/bundle_check.py,sha256=l_3BSuYk6juXQmsNU6jkxRbH8ayH2GkiW9ONKMQ1oJY,18270
-rosotacom/cli.py,sha256=LNawoIvPNgyi8OezEjcmY1yViCrH8ZmGFZiH7Ckn964,448335
+rosotacom/cli.py,sha256=GddGxo5-khCsLKvrBziYNE22ALqZavy0ojOkOmAldtc,453004
 rosotacom/cli_benchmark.py,sha256=LsSwy42afqLv7euMVg5l_E9G1HHI0IyNWGQ_UDfFz0Y,356428
 rosotacom/deployment.py,sha256=XVhB8JjxhAsglSEEPtiVSeV6fCG0rgGmDRulh14oIYQ,7318
 rosotacom/ffmpeg_packet.py,sha256=zB1BHgY1kexr5sETVMkm4bkVnRytj9k2t0uOYiHUZ6M,4267
@@ -205,9 +205,9 @@ rosotacom/resources/ws/session/creation/generate_session_files.py,sha256=3Sx4xTS
 rosotacom/resources/ws/session/creation/run_session.py,sha256=G2hJhrmLp11gm3JZ6_C-zZcqu_reXlE_wmobB7BiCfU,16849
 rosotacom/resources/ws/session/creation/run_session_in_external_terminal.py,sha256=Ub_5f-ttUUc-rAPrZmg_Op34s8Z4C91hTyEn8fgyt-E,2633
 rosotacom/resources/ws/session/creation/strip_ansi.py,sha256=vNjpemcq4xHr0VG4x0bZqvgwEBEfOgN-b4PzbrM5nfM,851
-rosotacom_dev-2.5.dev82.dist-info/licenses/LICENSE.txt,sha256=FDB3-fao3lqZ94wsJHKAH7U88kAnfvZhZC8Hm5rN__g,1459
-rosotacom_dev-2.5.dev82.dist-info/METADATA,sha256=LsLR74hGwoUePIz8usF8LvnJo4JoNAQ-Zdgb_qAgKq8,58884
-rosotacom_dev-2.5.dev82.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-rosotacom_dev-2.5.dev82.dist-info/entry_points.txt,sha256=im11ZWqBbgjQUBz2Ik2RNfMu54wlMwgiVpsBKeI7dCI,49
-rosotacom_dev-2.5.dev82.dist-info/top_level.txt,sha256=BZrtQcIVDWn_pQZR3Mlssqy5SaRXHjOa6B-1D9Fy4Ao,10
-rosotacom_dev-2.5.dev82.dist-info/RECORD,,
+rosotacom_dev-2.5.dev84.dist-info/licenses/LICENSE.txt,sha256=FDB3-fao3lqZ94wsJHKAH7U88kAnfvZhZC8Hm5rN__g,1459
+rosotacom_dev-2.5.dev84.dist-info/METADATA,sha256=lbrq3oXAPpIJHSTnd9W-ZTNODW2EJFJpYTp3Uoilj14,58884
+rosotacom_dev-2.5.dev84.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+rosotacom_dev-2.5.dev84.dist-info/entry_points.txt,sha256=im11ZWqBbgjQUBz2Ik2RNfMu54wlMwgiVpsBKeI7dCI,49
+rosotacom_dev-2.5.dev84.dist-info/top_level.txt,sha256=BZrtQcIVDWn_pQZR3Mlssqy5SaRXHjOa6B-1D9Fy4Ao,10
+rosotacom_dev-2.5.dev84.dist-info/RECORD,,