manta-node 0.6b5.dev707__py3-none-any.whl → 0.6b5.dev742__py3-none-any.whl

manta_node/cli/_version_generated.py

@@ -4,7 +4,7 @@ This file is auto-generated at build time by scripts/generate_version.py.
 Do not edit manually.
 """
 
-__version__ = "2026.09.25.d14aac9a"
-__build_date__ = "2026.09.25"
-__commit_id__ = "d14aac9a"
+__version__ = "2026.09.29.6a0ccdc7"
+__build_date__ = "2026.09.29"
+__commit_id__ = "6a0ccdc7"
 __package_version__ = "0.6b5"

manta_node/infrastructure/metrics/metrics_collector.py

@@ -132,16 +132,27 @@ class MetricsCollectorBase(ABC):
         cpu_metrics = await self.collect_cpu_metrics()
         memory_metrics = await self.collect_memory_metrics()
         # gpu_metrics = await self.collect_gpu_metrics()
-        # additional_metrics = await self.collect_additional_metrics()
         # platform_info = self.get_platform_info()
 
+        # Disk/network is best-effort: the manager is waiting on this snapshot
+        # for its heartbeat, so a failure collecting it must not cost the
+        # cpu/memory reading. `additional=None` and an unset field serialize
+        # identically (proto3 explicit presence), which is also what a build
+        # too old to collect it sends -- both cases correctly report "no
+        # disk/network reading this cycle", never a stale or partial one.
+        try:
+            additional_metrics = await self.collect_additional_metrics()
+        except Exception as e:
+            self.tracer.error(f"Error collecting additional metrics: {e}")
+            additional_metrics = None
+
         # Combine all metrics into a snapshot
         metrics = MetricsSnapshot(
             timestamp=datetime.now(timezone.utc),
             cpu=cpu_metrics,
             memory=memory_metrics,
             # gpu=gpu_metrics,
-            # additional=additional_metrics,
+            additional=additional_metrics,
             # platform=platform_info,
         )
 
@@ -322,40 +333,60 @@ class GenericMetricsCollector(MetricsCollectorBase):
         """
         # psutil is now always available
 
-        # Get disk usage
-        disk_usage = []
-        for partition in psutil.disk_partitions(all=False):
-            try:
-                usage = psutil.disk_usage(partition.mountpoint)
-                disk_usage.append(
-                    DiskUsage(
-                        mount_point=partition.mountpoint,
-                        total_bytes=usage.total,
-                        used_bytes=usage.used,
-                        free_bytes=usage.free,
-                        percent_used=usage.percent,
+        def read_additional_metrics() -> AdditionalMetrics:
+            # Get disk usage. `all=False` already drops pseudo/virtual
+            # filesystems (overlay, tmpfs, proc, sysfs, ...): on Linux it
+            # keeps only fstypes absent from /proc/filesystems' `nodev` list,
+            # which excludes a container's own overlay root along with the
+            # rest. What it does NOT dedupe: Docker bind-mounts
+            # /etc/hostname, /etc/hosts and /etc/resolv.conf from one
+            # host-side file each, and psutil lists each bind mount as its
+            # own partition even though all three share one underlying
+            # device -- so every container reports that one disk three times
+            # over unless a device already seen is skipped.
+            disk_usage = []
+            seen_devices: set[str] = set()
+            for partition in psutil.disk_partitions(all=False):
+                if partition.device in seen_devices:
+                    continue
+                seen_devices.add(partition.device)
+                try:
+                    usage = psutil.disk_usage(partition.mountpoint)
+                    disk_usage.append(
+                        DiskUsage(
+                            mount_point=partition.mountpoint,
+                            total_bytes=usage.total,
+                            used_bytes=usage.used,
+                            free_bytes=usage.free,
+                            percent_used=usage.percent,
+                        )
                     )
-                )
-            except (PermissionError, OSError):
-                # Some mountpoints may not be accessible
-                pass
+                except (PermissionError, OSError):
+                    # Some mountpoints may not be accessible
+                    pass
+
+            # Get basic network info
+            net_io = psutil.net_io_counters()
+            network = NetworkUsage(
+                bytes_sent=net_io.bytes_sent,
+                bytes_recv=net_io.bytes_recv,
+                packets_sent=net_io.packets_sent,
+                packets_recv=net_io.packets_recv,
+            )
 
-        # Get basic network info
-        net_io = psutil.net_io_counters()
-        network = NetworkUsage(
-            bytes_sent=net_io.bytes_sent,
-            bytes_recv=net_io.bytes_recv,
-            packets_sent=net_io.packets_sent,
-            packets_recv=net_io.packets_recv,
-        )
+            # Get system uptime
+            boot_time = psutil.boot_time()
+            uptime_seconds = time.time() - boot_time
 
-        # Get system uptime
-        boot_time = psutil.boot_time()
-        uptime_seconds = time.time() - boot_time
+            return AdditionalMetrics(
+                disk_usage=disk_usage,
+                network=network,
+                uptime_seconds=int(uptime_seconds),
+            )
 
-        # Combine all additional metrics
-        return AdditionalMetrics(
-            disk_usage=disk_usage,
-            network=network,
-            uptime_seconds=int(uptime_seconds),
-        )
+        # A stat per surviving partition plus two /proc reads, all blocking
+        # syscalls; this now runs on the ~1s production heartbeat
+        # (ping_interval, infrastructure/mqtt/command_handler.py), so it must
+        # not block the shared event loop -- the same reason
+        # collect_memory_metrics reads psutil off-thread.
+        return await asyncio.to_thread(read_additional_metrics)

manta_node/seam.py

@@ -51,6 +51,7 @@ class SeamState(str, Enum):
     REVERTING = "reverting"
     REPORTING = "reporting"
     REVERTED = "reverted"
+    SKIPPED = "skipped"
     FAILED = "failed"
     DOWN = "down"
 

manta_node/supervisor/lifecycle.py

@@ -99,7 +99,8 @@ def run_switch(
     """Run the lifecycle for one request and return its terminal outcome.
 
     Terminal states: ``REPORTING`` (came back on the new version), ``REVERTED``
-    (no return within the window, reverted to the last good), ``FAILED`` (a
+    (no return within the window, reverted to the last good), ``SKIPPED`` (the
+    target is already current; nothing to do, no restart), ``FAILED`` (a
     pre-switch step failed; nothing changed), ``DOWN`` (the switch happened and
     the revert itself failed — the node is not running, surfaced honestly).
 
@@ -107,6 +108,15 @@ def run_switch(
     lifecycle resolves, so a supervisor restart mid-window can re-evaluate it.
     """
     bounds = bounds or Bounds()
+
+    # NO-OP — applying the pair already current changes nothing (NF-5). Return
+    # before fetch/verify/stage/commit, so the child is NOT restarted: under B1 a
+    # re-apply would otherwise be a full switch and restart the node for no change
+    # (the daily loop that never converges). `force` does not bypass this: it is
+    # the not-newer override, and a deliberate bounce is a unit restart.
+    if version_tree.is_current_pair(request.target):
+        return _outcome(request, SeamState.SKIPPED, "target is already current")
+
     last_good_dir = version_tree.selected()
     last_good = last_good_dir.name if last_good_dir else None
     candidate_dir = request.target

manta_node/supervisor/switch.py

@@ -215,6 +215,26 @@ def is_pointer_target(target: Path) -> bool:
     return link.is_symlink() and Path(os.path.realpath(link)) == target
 
 
+def is_current_pair(pair: str) -> bool:
+    """True when the pair named by ``pair`` is already the current version.
+
+    A request to apply the code already running is a no-op (NF-5): under B1 a
+    re-apply would otherwise fetch, verify, stage, commit and **restart** the
+    child, restarting the node for no change. The check is by pair identity, so it
+    holds whether the target names the version dir directly or a set id that
+    resolves to it. A node with no valid ``current`` is never "already current".
+    """
+    version_dir = selected()
+    if version_dir is None:
+        return False
+    # The dir name and the manifest's pair are the same identity; either naming it
+    # is an exact match on what is running.
+    if version_dir.name == pair:
+        return True
+    manifest = read_manifest(version_dir)
+    return manifest is not None and manifest.pair == pair
+
+
 def list_versions() -> list[Path]:
     """The version dirs, oldest first.
 

{manta_node-0.6b5.dev707.dist-info → manta_node-0.6b5.dev742.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: manta_node
-Version: 0.6b5.dev707
+Version: 0.6b5.dev742
 Summary: Node side software of the Manta platform. It is responsible for the communication with the Manta Core and the execution of the tasks.
 Author-email: Hugo Miralles <hugo.miralles@manta-tech.io>, Matthew Thompson <matthew.thompson@manta-tech.io>
 License-Expression: AGPL-3.0-or-later
@@ -28,7 +28,7 @@ Requires-Dist: pyyaml
 Requires-Dist: psutil
 Requires-Dist: msgpack
 Requires-Dist: aiomqtt<3.0,>=2.5.1
-Requires-Dist: manta-common-core<=0.6b5,>=0.6b5.dev668
+Requires-Dist: manta-common-core<=0.6b5,>=0.6b5.dev738
 Requires-Dist: toml
 Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: tomli-w

{manta_node-0.6b5.dev707.dist-info → manta_node-0.6b5.dev742.dist-info}/RECORD

@@ -1,12 +1,12 @@
 manta_node/__init__.py,sha256=bgGWXH3yQVhNf0v1ZGUBAy5Y51fqb0Y-EaLnocbcino,153
 manta_node/__main__.py,sha256=SjrJyuMg_ZFKV6WOVe3MrtWM8Qmu065dkKZYl4n2YLw,1665
 manta_node/node_orchestrator.py,sha256=nfpNCM8wgnihKhZZ36GIizmyyaOdEOBhdfn7PqqTCrQ,29591
-manta_node/seam.py,sha256=wAI3uL1iuV6pmDOaBW7WZi7_V7-NsHQDP6C_gFIjCiA,4747
+manta_node/seam.py,sha256=npu2QdIqnybiz0h4Wb7aE4vPwXJIWTZW3z31FSk6sFk,4771
 manta_node/task_manager.py,sha256=xRE-yKdUW0FFR8vtX1jDwl1AxTbqVD_JS7QVR62GA00,38002
 manta_node/tasks.py,sha256=o837Hi-KFVJg9LF5iOtE8oD6UuTOfrEPWR-JOdhRGeY,6983
 manta_node/utils.py,sha256=Hw4Iw2jYQYsfVLVJuBMt-_rMFBeml3nCDE2jiiXc8YM,1155
 manta_node/cli/__init__.py,sha256=arzO3mXDJ-E2yeeytbZfN7mCswwxdQ43_QjyeL2E5yE,134
-manta_node/cli/_version_generated.py,sha256=oq-vrYUSYqZEeiOos3Fqzj9GAI7ShLAmLb-7xD8MTio,275
+manta_node/cli/_version_generated.py,sha256=SEyf_9vyzjLestxXRcjIeAys-zf8ukAgt9rRCNp9zpM,275
 manta_node/cli/config_manager.py,sha256=BCju9zqzraviL3KrzRnB-vZQUY__Q5kuEqb7EdB8YdI,4409
 manta_node/cli/main.py,sha256=dZa6zrypWBvpN8hd4qpxevvlyNFhxKINCg1537NJ36w,4318
 manta_node/cli/version.py,sha256=3lrnIWpOosszBN-VsCBVLxDgpvCC7IB0aDIKx_3e7hI,3115
@@ -39,7 +39,7 @@ manta_node/infrastructure/grpc/local_servicer.py,sha256=9PFAwpKKFGy3P7HZfx2BHwhO
 manta_node/infrastructure/grpc/world_servicer.py,sha256=nmyrMzYxzGDlZ1-oOeyALgd76mbeOmAOsjzoVN6f0SA,8222
 manta_node/infrastructure/metrics/__init__.py,sha256=ODGAj9s63F5jba2c3dQRMfNK6I4WvMdcJUS_xApUN5Y,272
 manta_node/infrastructure/metrics/collector.py,sha256=9ESw__Pc2tV6ldG5yhos2IS7T5Td59KxTIwDRZc_G4w,3067
-manta_node/infrastructure/metrics/metrics_collector.py,sha256=TI_9tRoIUunGx_BstVavK6VElig7Wc5mJ0kB4bFumVs,11048
+manta_node/infrastructure/metrics/metrics_collector.py,sha256=osIYrNzU3g9WCAxVQ14isM9YEQ3eJ7F3QgKBbpgeMJs,13077
 manta_node/infrastructure/mqtt/__init__.py,sha256=riXo1sXgO4YV6DHCmWRqK61BAmuGLdHiVdQFunAJadA,140
 manta_node/infrastructure/mqtt/command_handler.py,sha256=aGJMPF8uAdeEw5xfE_WlL3-ROiSV_LCUXf5EpmZrbtk,29728
 manta_node/infrastructure/network/__init__.py,sha256=On3XLgycFQoc-fBCa5hFuFDfEJjmFy7Wl2CK3D2LkdI,478
@@ -56,14 +56,14 @@ manta_node/supervisor/__init__.py,sha256=kgdoNce1tM4e7jvdxkdmnNJV1L92-NI2cRfYSdm
 manta_node/supervisor/bounds.py,sha256=MlUfj0tYY-US348JsxYA-Ph5pSpgoOPlRdVTwmrPtZA,3181
 manta_node/supervisor/executor.py,sha256=a0JafVoTmtbIu87nwUtj08KAC-Q-u0Ajdn_ptyu9yoc,6833
 manta_node/supervisor/inflight.py,sha256=JOqwXYM928fpcQtYdoK7596eAg28KM70bh85cyQgX3Q,2663
-manta_node/supervisor/lifecycle.py,sha256=SA-xJqlxwbLa37fvp0W_YbUZbrRz9vQJDpg6vvuokpI,10303
+manta_node/supervisor/lifecycle.py,sha256=HARQv3wYyK-ZjcBac-ixQMVlkjHvNtIpRdSMm2lNHCQ,10915
 manta_node/supervisor/process.py,sha256=N5WvNCJnJR3c6I4uqBPPFqgEdCI9rFulHyGem9Shc-I,19155
 manta_node/supervisor/records.py,sha256=fUlL1SfmWpGnCbJ9956cuy0H3a7-aEF-B-naqbJiYoU,6405
 manta_node/supervisor/seam.py,sha256=HomMFTDbc0dZQ9VrfGVhQxjiU7E23-zwyjZnLsnq6dc,8031
-manta_node/supervisor/switch.py,sha256=iWLukvuxynK3NU26iIk0qhkwrRPUyJuutV67QA3aLO8,16732
-manta_node-0.6b5.dev707.dist-info/licenses/LICENSE,sha256=9mBgLhiB9goQPQjg9XQJ6FjgVxYw9Q8lyOZYkPGwF_c,34484
-manta_node-0.6b5.dev707.dist-info/METADATA,sha256=uOmOaIVFbJllDFQMjCOr4zfNlYc-Qq9V4VaBk6uHYDg,4231
-manta_node-0.6b5.dev707.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-manta_node-0.6b5.dev707.dist-info/entry_points.txt,sha256=uCwggRApalLEsYs1YxwTBN0-e9oMJAkMoBp01HaSdoY,110
-manta_node-0.6b5.dev707.dist-info/top_level.txt,sha256=nbT5J5WETuXM9UPoQckl29uUOq8wMYdRb9QDx5kAFeo,11
-manta_node-0.6b5.dev707.dist-info/RECORD,,
+manta_node/supervisor/switch.py,sha256=hFCWhZDoWN9KN0zkNepsQfkypDhhlkBKmCOltCqlb3w,17614
+manta_node-0.6b5.dev742.dist-info/licenses/LICENSE,sha256=9mBgLhiB9goQPQjg9XQJ6FjgVxYw9Q8lyOZYkPGwF_c,34484
+manta_node-0.6b5.dev742.dist-info/METADATA,sha256=kD0dvyj-vlf8iKCY3_M1Juc2IFWE_kqUsyk7IIDB930,4231
+manta_node-0.6b5.dev742.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+manta_node-0.6b5.dev742.dist-info/entry_points.txt,sha256=uCwggRApalLEsYs1YxwTBN0-e9oMJAkMoBp01HaSdoY,110
+manta_node-0.6b5.dev742.dist-info/top_level.txt,sha256=nbT5J5WETuXM9UPoQckl29uUOq8wMYdRb9QDx5kAFeo,11
+manta_node-0.6b5.dev742.dist-info/RECORD,,