manta-node 0.6b1.dev664__py3-none-any.whl → 0.6b5.dev672__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.18.b4934360"
+__version__ = "2026.09.18.ba835c28"
 __build_date__ = "2026.09.18"
-__commit_id__ = "b4934360"
-__package_version__ = "0.6b1"
+__commit_id__ = "ba835c28"
+__package_version__ = "0.6b5"

manta_node/cli/version.py

@@ -98,7 +98,7 @@ def get_full_version_info() -> dict:
         "version": get_version_string(),
         "date": datetime.now().strftime("%Y.%m.%d"),
         "commit": commit_id or "unknown",
-        "package_version": "0.6b1",  # mirrors pyproject.toml [project].version; nothing syncs the two, so both move together
+        "package_version": "0.6b5",  # mirrors pyproject.toml [project].version; nothing syncs the two, so both move together
     }
 
 

manta_node/infrastructure/container/docker_adapter.py

@@ -1,5 +1,6 @@
 import asyncio
 import concurrent.futures
+import shutil
 from datetime import datetime
 from enum import Enum
 
@@ -7,6 +8,7 @@ from aiodocker import Docker
 from aiodocker.docker import DockerContainer
 from aiodocker.exceptions import DockerError
 from docker import DockerClient
+from docker.utils import parse_repository_tag
 from manta_common.errors import MantaDockerError
 from manta_common.traces import Tracer
 
@@ -35,6 +37,27 @@ class ImageFreshness(Enum):
     UNKNOWN = "unknown"
 
 
+# The daemon's own vocabulary for an image with no tag and no digest -- one
+# nobody can name and no launch can reach.
+_DANGLING = {"dangling": ["true"]}
+
+
+def _repository(image: str) -> str:
+    """The repository of an image reference, without tag or digest.
+
+    docker-py's parser, because a registry port (``localhost:5000/r/i:t``) is
+    not a tag separator and a hand-written split gets it wrong.
+    """
+    repository, _tag = parse_repository_tag(image)
+    return repository
+
+
+def _human(size: int) -> str:
+    if size >= 2**30:
+        return f"{size / 2**30:.1f} GiB"
+    return f"{size / 2**20:.1f} MiB"
+
+
 class DockerRaiser:
     async_client: Docker
     tracer: Tracer
@@ -45,6 +68,8 @@ class DockerRaiser:
     _PULL_EXECUTOR = concurrent.futures.ThreadPoolExecutor(
         max_workers=4, thread_name_prefix="docker-pull"
     )
+    # Per instance, created on first use: this class has no __init__ of its own.
+    _pull_lock: asyncio.Lock | None = None
 
     async def image_freshness(self, image: str) -> ImageFreshness:
         """
@@ -149,6 +174,39 @@ class DockerRaiser:
             local-only image with nothing to compare), ``UNKNOWN`` when the
             registry could not be asked. ``STALE`` is never returned — a stale
             image is pulled, and a pull that fails raises instead of returning.
+
+        Raises
+        ------
+        MantaDockerError
+            The pull failed, or was refused because the daemon's filesystem
+            cannot hold the image (below).
+
+        Notes
+        -----
+        A pull is one serialized sequence, ``_pull_replacing``: prune, measure,
+        refuse, pull, remove. The ORDER is the invariant — a moved tag must never
+        need more free space than a single image. Removing the image a tag left
+        behind AFTER the pull cannot be what makes room, because on a node
+        holding N leftovers the pull is the thing that fails; so every dangling
+        image no container uses goes BEFORE the pull, the free space on the
+        daemon's data root is measured AFTER they are gone, and a pull that still
+        cannot fit is refused in one readable error rather than dying inside
+        docker-py with its reason swallowed. One lock covers the whole sequence:
+        two concurrent starts measuring the same free space would each admit a
+        pull the other one spends.
+
+        Two facts of the containerd image store shape those steps. An image a
+        tag moved off keeps NO RepoTags and NO RepoDigests, so the leftovers of
+        a repository cannot be asked for by name — ``dangling`` is the criterion,
+        narrowed to images no container (running or exited) uses, unforced so the
+        daemon's own 409 is the backstop. And ``GET /images/json`` reports
+        ``Size`` as the on-disk footprint while ``inspect`` reports the
+        compressed content alone, so the pull is sized from the listing: the
+        largest local image of the same repository, a floor rather than the
+        figure (layer sharing lowers the need, download scratch space raises
+        it). Housekeeping never fails a launch, and a question the daemon cannot
+        answer — no local image of the repository, a data root not on this host
+        — proceeds and says so, the rule ``UNKNOWN`` already sets above.
         """
         if force_pull:
             # Ahead of the comparison, not merged into it: the comparison is a
@@ -172,10 +230,97 @@ class DockerRaiser:
         return freshness
 
     async def _pull_replacing(self, image: str) -> None:
-        """Pull ``image`` and, when the pull moved the tag, remove the image it left."""
-        previous_id = await self._local_image_id(image)
-        await self.pull_image_or_raise(image)
-        await self._remove_superseded_image(image, previous_id)
+        """Prune, measure, refuse, pull, remove what the tag left — under one lock."""
+        if self._pull_lock is None:
+            self._pull_lock = asyncio.Lock()
+        async with self._pull_lock:
+            previous_id = await self._local_image_id(image)
+            await self._prune_dangling_images(image)
+            await self._refuse_pull_without_room(image)
+            await self.pull_image_or_raise(image)
+            await self._remove_superseded_image(image, previous_id)
+
+    async def _prune_dangling_images(self, image: str) -> None:
+        """Delete every dangling image no container uses; unforced, never raises."""
+        try:
+            dangling = await self.async_client.images.list(filters=_DANGLING)
+            containers = await self.async_client.containers.list(all=True)
+        except Exception as exc:
+            self.tracer.warning(
+                f"Dangling images not pruned before pulling {image}: {exc!r}"
+            )
+            return
+        in_use = {container["ImageID"] for container in containers}
+        for entry in dangling:
+            image_id = entry.get("Id")
+            if not image_id:
+                continue
+            if image_id in in_use:
+                self.tracer.info(
+                    f"Dangling image {image_id} kept before pulling {image}: a "
+                    f"container still uses it"
+                )
+                continue
+            try:
+                await self.async_client.images.delete(image_id)
+            except Exception as exc:
+                self.tracer.warning(
+                    f"Dangling image {image_id} kept before pulling {image}: {exc!r}"
+                )
+                continue
+            self.tracer.info(
+                f"Removed dangling image {image_id} "
+                f"({_human(int(entry.get('Size') or 0))}) before pulling {image}"
+            )
+
+    async def _refuse_pull_without_room(self, image: str) -> None:
+        """Raise before the pull when the daemon's filesystem cannot hold it."""
+        try:
+            info = await asyncio.to_thread(self.docker_client.info)
+            root = info["DockerRootDir"]
+        except Exception as exc:
+            self.tracer.warning(
+                f"Free space not checked before pulling {image}: the daemon's data "
+                f"root could not be read: {exc!r}"
+            )
+            return
+        try:
+            free = (await asyncio.to_thread(shutil.disk_usage, root)).free
+        except OSError as exc:
+            # A remote daemon's root is not on this filesystem.
+            self.tracer.warning(
+                f"Free space not checked before pulling {image}: {root} could not "
+                f"be measured from this host: {exc!r}"
+            )
+            return
+
+        repository = _repository(image)
+        try:
+            siblings = await self.async_client.images.list(
+                filters={"reference": [repository]}
+            )
+        except Exception as exc:
+            self.tracer.warning(
+                f"Free space not checked before pulling {image}: the local images "
+                f"of {repository} could not be listed: {exc!r}"
+            )
+            return
+        needed = max((int(entry.get("Size") or 0) for entry in siblings), default=0)
+        if needed == 0:
+            self.tracer.info(
+                f"{_human(free)} free under {root}; no local image of {repository} "
+                f"to size the pull of {image} against"
+            )
+            return
+        if free < needed:
+            message = (
+                f"Image {image} not pulled: {_human(free)} free under {root}, and "
+                f"the {repository} image already on this node occupies "
+                f"{_human(needed)}. A pull that size cannot complete here; the "
+                f"node already pruned what it could -- free the disk and retry."
+            )
+            self.tracer.error(message)
+            raise MantaDockerError(message, metadata=self.tracer.metadata)
 
     async def _local_image_id(self, image: str) -> str | None:
         """The image id ``image`` resolves to on this daemon, or None if absent."""

{manta_node-0.6b1.dev664.dist-info → manta_node-0.6b5.dev672.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: manta_node
-Version: 0.6b1.dev664
+Version: 0.6b5.dev672
 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.6b1,>=0.6b1.dev644
+Requires-Dist: manta-common-core<=0.6b5,>=0.6b5.dev0
 Requires-Dist: toml
 Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: tomli-w
@@ -51,7 +51,7 @@ Dynamic: license-file
 
 # Manta Node Python
 
-![Version](https://img.shields.io/badge/version-0.6b1-orange)
+![Version](https://img.shields.io/badge/version-0.6b5-orange)
 ![Python version](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20-blue)
 ![Coverage Badge](.github/coverage/coverage.svg)
 ![Ruff](https://img.shields.io/badge/code_style-ruff-2a1833)

{manta_node-0.6b1.dev664.dist-info → manta_node-0.6b5.dev672.dist-info}/RECORD

@@ -5,10 +5,10 @@ manta_node/task_manager.py,sha256=xRE-yKdUW0FFR8vtX1jDwl1AxTbqVD_JS7QVR62GA00,38
 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=z5l9YimO0j_n8NgmuO_ao5t4sw4wBPFdgX__tVPQQ2Y,275
+manta_node/cli/_version_generated.py,sha256=kQBkXymO8TdGeYtp5QcYpA4uOGjqOWyB_bV_1WRaGGk,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=KbI0pHsBxT5LayA9fTTMBR6LIIcDeZJxyqQCwjQO560,3115
+manta_node/cli/version.py,sha256=3lrnIWpOosszBN-VsCBVLxDgpvCC7IB0aDIKx_3e7hI,3115
 manta_node/cli/commands/__init__.py,sha256=GKLOURXZqec5B3H3EiwX41xDISGg6cO_kCueoyZvt0Q,505
 manta_node/cli/commands/cluster.py,sha256=kUVopCN4xkEk-IR1aKpr7bfBSQEtG6pEj_hlWno5SZQ,14257
 manta_node/cli/commands/config.py,sha256=BiarCD0S8rcNYbio4RLzDvUS7A50s5dd5F4TiZqLR6M,16577
@@ -26,7 +26,7 @@ manta_node/infrastructure/executor.py,sha256=wbH5-G4Y3iNTPr8ROWRDT-bWD-CYl1YFlZQ
 manta_node/infrastructure/config/__init__.py,sha256=VnKidPAVfzlZMb5WM-MggtsDLM8tdAFFWlB7WSiawzc,617
 manta_node/infrastructure/config/node_config_manager.py,sha256=Js6PISjR_JRXMhgFC7lzI6StjW5paFhdhmtteao9j5A,35228
 manta_node/infrastructure/container/__init__.py,sha256=ACDyzGvtM7nfTsBXDAYFjkKgU2yu4Umj3CQ_rlRfw1I,300
-manta_node/infrastructure/container/docker_adapter.py,sha256=IkVdzVXGSey6EfRzOmiKFNzJvS9Z7JBfB3Y9x9oJLCY,17689
+manta_node/infrastructure/container/docker_adapter.py,sha256=hI5YenhcZwn19_chA8UM2RT6cmcnknzVcmu7AeHrkWo,24221
 manta_node/infrastructure/container/executor.py,sha256=0aTFXDv-oXz81qwGi6zl_4qtkFriPWzn7iiiTRg7KJM,7274
 manta_node/infrastructure/container/image_executor.py,sha256=noNwde03hw9k3EnK1JuQGtByUf-XDHqx623X0DKgHZ0,10315
 manta_node/infrastructure/container/manager.py,sha256=kylDl-5VZk01tzSXVrWI9VPn8mqi6tV-7Rf1tkMgee0,15790
@@ -51,9 +51,9 @@ manta_node/infrastructure/process/executor.py,sha256=Ab1XvNuelEGCD5KdZLgYYnpjYZ5
 manta_node/infrastructure/security/__init__.py,sha256=lI6vkbUmfmt0m363iO4HzuzVNoQAc7Clp2R5vAhZbgE,64
 manta_node/infrastructure/security/auth_agent.py,sha256=WkPTg_g0gix7xomb_on_Ft3TNX0FpeqS7gwgJW9mTvk,11037
 manta_node/infrastructure/security/token_provider.py,sha256=u3bcbQYNBskFzunO-wOSZpGkDN_CU1BCB5HUbZTC4Vg,1832
-manta_node-0.6b1.dev664.dist-info/licenses/LICENSE,sha256=9mBgLhiB9goQPQjg9XQJ6FjgVxYw9Q8lyOZYkPGwF_c,34484
-manta_node-0.6b1.dev664.dist-info/METADATA,sha256=l6ZlfudtPepYV949B8DFT7Fg1zs2v_e58x0KrTJ-vRQ,4215
-manta_node-0.6b1.dev664.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-manta_node-0.6b1.dev664.dist-info/entry_points.txt,sha256=C_zcw6mdmztNxVUZGLZ83UH5TwcSuqb2C-rB4e2CQoc,56
-manta_node-0.6b1.dev664.dist-info/top_level.txt,sha256=nbT5J5WETuXM9UPoQckl29uUOq8wMYdRb9QDx5kAFeo,11
-manta_node-0.6b1.dev664.dist-info/RECORD,,
+manta_node-0.6b5.dev672.dist-info/licenses/LICENSE,sha256=9mBgLhiB9goQPQjg9XQJ6FjgVxYw9Q8lyOZYkPGwF_c,34484
+manta_node-0.6b5.dev672.dist-info/METADATA,sha256=F8qtn5_RUOnONURnsYxEbm2SWM41xJQ04AbK7eAc8z0,4213
+manta_node-0.6b5.dev672.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+manta_node-0.6b5.dev672.dist-info/entry_points.txt,sha256=C_zcw6mdmztNxVUZGLZ83UH5TwcSuqb2C-rB4e2CQoc,56
+manta_node-0.6b5.dev672.dist-info/top_level.txt,sha256=nbT5J5WETuXM9UPoQckl29uUOq8wMYdRb9QDx5kAFeo,11
+manta_node-0.6b5.dev672.dist-info/RECORD,,