mirror of
https://scm.tikali.ai/tikali/applications/monky/monky-deployd.git
synced 2026-09-18 04:36:15 +00:00
fix(onboarding): identity read that survives a rewrite, disk refused before the pull — 0.1.8
Three faults from one agent-managed onboarding (env-dev-08, 2026-09-09), each of which pointed the diagnosis away from the actual fault. 1. install.sh granted the agent's read on the ziti identity with a POSIX ACL. ziti-edge-tunnel rewrites that file on a controller config update and the rewrite drops the ACL: the agent applied cleanly at 01:21 and was failing every tick by 01:32. Group membership survives the rewrite (the file stays ziti:ziti 0640), so install.sh and the package postinstall now add monky-deployd to the `ziti` group, and a default ACL on the identity directory carries the grant onto a newly created file. The explicit ACLs stay for the boxes that need them. 2. openziti.load() accepts an unreadable or malformed identity: the C SDK logs "configuration is invalid" and returns a context that only fails at dial, as a bare TypeError, which the transport reported as a missing intercept or a policy gap. The SDK transport now reads and parses the identity itself and names the real fault first. 3. The disk pre-flight ran only when the bundle declared disk_need_bytes, so a bundle without one died mid-pull with containerd's "no space left on device" — which reads as a registry fault. A bundle that declares no size now has to clear the headroom floor, and the pre-flight measures containerd's root as well as the docker data-root: docker 29 keeps image layers in the containerd image store, and on env-dev-08 those sat on different filesystems (93 GiB free where the agent looked, 2.8 GiB where the pull wrote). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KLB7jieMNRkTsJ2epr4Ds1
This commit is contained in:
@@ -52,6 +52,9 @@ def fake_docker(tmp_path, monkeypatch):
|
||||
}
|
||||
)
|
||||
)
|
||||
# the real agent also measures containerd's root; on a CI runner that path belongs to the
|
||||
# runner's own docker and would make every disk assertion depend on the runner's free space.
|
||||
monkeypatch.setattr("monky_deployd.compose.CONTAINERD_ROOTS", ())
|
||||
monkeypatch.setenv("PATH", f"{FAKEBIN}:{os.environ['PATH']}")
|
||||
monkeypatch.setenv("FAKE_DOCKER_LOG", str(log))
|
||||
monkeypatch.setenv("FAKE_DOCKER_STATE", str(state))
|
||||
|
||||
@@ -237,6 +237,30 @@ def test_disk_refusal(bootstrapped, tenancy, fake_docker):
|
||||
assert tenancy.leases == []
|
||||
|
||||
|
||||
def test_disk_refusal_without_a_declared_size(bootstrapped, tenancy, fake_docker, monkeypatch):
|
||||
"""A bundle that declares no size still has to clear the headroom floor.
|
||||
|
||||
Without the floor a nearly-full box passes the pre-flight and dies mid-pull with
|
||||
containerd's "no space left on device", which reads as a registry fault (env-dev-08).
|
||||
"""
|
||||
cfg = bootstrapped
|
||||
cfg.disk.headroom_bytes = 2 * 1024**3
|
||||
monkeypatch.setattr("monky_deployd.compose.Docker.free_bytes", lambda self, path=None: 32 * 2**20)
|
||||
tenancy.set_files(make_files())
|
||||
assert tick(cfg) == EX_FAIL
|
||||
detail = tenancy.reports[-1]["detail"]
|
||||
assert "DISK_INSUFFICIENT" in detail and "declares no size" in detail
|
||||
assert tenancy.leases == []
|
||||
|
||||
|
||||
def test_ample_disk_without_a_declared_size_applies(bootstrapped, tenancy, fake_docker, monkeypatch):
|
||||
cfg = bootstrapped
|
||||
monkeypatch.setattr("monky_deployd.compose.Docker.free_bytes", lambda self, path=None: 500 * 2**30)
|
||||
tenancy.set_files(make_files())
|
||||
assert tick(cfg) == EX_OK
|
||||
assert tenancy.reports[-1]["result"] == "applied"
|
||||
|
||||
|
||||
def test_legacy_approle_lease_is_refused_loudly(bootstrapped, tenancy, fake_docker):
|
||||
cfg = bootstrapped
|
||||
tenancy.lease_shape = "approle"
|
||||
|
||||
@@ -79,6 +79,8 @@ def test_sdk_transport_uses_openziti_monkeypatch(monkeypatch, tmp_path):
|
||||
srv = socket.socket()
|
||||
srv.bind(("127.0.0.1", 0))
|
||||
srv.listen(1)
|
||||
# the transport pre-flights the identity file before handing it to the SDK
|
||||
(tmp_path / "id.json").write_text('{"ztAPI": "https://example.invalid"}')
|
||||
t = SdkTransport(str(tmp_path / "id.json"))
|
||||
s = t.connect("127.0.0.1", srv.getsockname()[1], 2)
|
||||
s.close()
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
"""Free-space accounting across the filesystems a pull can fill.
|
||||
|
||||
docker 29 keeps image layers in containerd's store, which is frequently on a different
|
||||
filesystem than DockerRootDir. env-dev-08 (2026-09-09) had 93 GiB free on the data-root and
|
||||
2.8 GiB on the filesystem containerd was writing to; the pull died with "no space left on
|
||||
device" after the pre-flight had reported plenty of room.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import monky_deployd.compose as compose_mod
|
||||
from monky_deployd.compose import Docker
|
||||
|
||||
|
||||
class _FixedDocker(Docker):
|
||||
def __init__(self, root: str):
|
||||
super().__init__()
|
||||
self._root = root
|
||||
|
||||
def data_root(self) -> str:
|
||||
return self._root
|
||||
|
||||
|
||||
def test_storage_paths_include_containerd_root_when_present(tmp_path, monkeypatch):
|
||||
root = tmp_path / "docker"
|
||||
containerd = tmp_path / "containerd"
|
||||
root.mkdir()
|
||||
containerd.mkdir()
|
||||
monkeypatch.setattr(compose_mod, "CONTAINERD_ROOTS", (str(containerd),))
|
||||
assert _FixedDocker(str(root)).storage_paths() == [str(root), str(containerd)]
|
||||
|
||||
|
||||
def test_storage_paths_skip_a_containerd_root_that_does_not_exist(tmp_path, monkeypatch):
|
||||
root = tmp_path / "docker"
|
||||
root.mkdir()
|
||||
monkeypatch.setattr(compose_mod, "CONTAINERD_ROOTS", (str(tmp_path / "absent"),))
|
||||
assert _FixedDocker(str(root)).storage_paths() == [str(root)]
|
||||
|
||||
|
||||
def test_free_bytes_reports_the_tightest_filesystem(tmp_path, monkeypatch):
|
||||
root = tmp_path / "docker"
|
||||
containerd = tmp_path / "containerd"
|
||||
root.mkdir()
|
||||
containerd.mkdir()
|
||||
monkeypatch.setattr(compose_mod, "CONTAINERD_ROOTS", (str(containerd),))
|
||||
d = _FixedDocker(str(root))
|
||||
monkeypatch.setattr(d, "_free_at", lambda p: 900 if p == str(root) else 5)
|
||||
assert d.free_bytes() == 5
|
||||
# an explicit path is still measured on its own
|
||||
assert d.free_bytes(str(root)) == 900
|
||||
|
||||
|
||||
def test_free_bytes_is_none_when_nothing_can_be_measured(tmp_path, monkeypatch):
|
||||
root = tmp_path / "docker"
|
||||
root.mkdir()
|
||||
monkeypatch.setattr(compose_mod, "CONTAINERD_ROOTS", ())
|
||||
d = _FixedDocker(str(root))
|
||||
monkeypatch.setattr(d, "_free_at", lambda p: None)
|
||||
assert d.free_bytes() is None
|
||||
@@ -0,0 +1,54 @@
|
||||
"""The SDK transport names an unusable identity file instead of failing at dial.
|
||||
|
||||
openziti.load() accepts an unreadable or malformed identity, logs "configuration is invalid"
|
||||
at the C layer and returns a context that only fails when something dials through it — as a
|
||||
bare TypeError that reads like a missing intercept. env-dev-08 (2026-09-09) lost its identity
|
||||
ACL to a tunneller rewrite and spent every tick reporting a mesh fault it did not have.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
|
||||
import pytest
|
||||
|
||||
from monky_deployd.transport import SdkTransport, TransportError
|
||||
|
||||
|
||||
def _sdk(path):
|
||||
t = SdkTransport(str(path))
|
||||
return t
|
||||
|
||||
|
||||
def test_missing_identity_is_named(tmp_path):
|
||||
with pytest.raises(TransportError) as e:
|
||||
_sdk(tmp_path / "absent.json")._check_identity_readable()
|
||||
assert "does not exist" in str(e.value)
|
||||
|
||||
|
||||
def test_malformed_identity_is_named(tmp_path):
|
||||
p = tmp_path / "id.json"
|
||||
p.write_text("{not json")
|
||||
with pytest.raises(TransportError) as e:
|
||||
_sdk(p)._check_identity_readable()
|
||||
assert "not valid JSON" in str(e.value)
|
||||
|
||||
|
||||
def test_unreadable_identity_points_at_the_group_grant(tmp_path, monkeypatch):
|
||||
p = tmp_path / "id.json"
|
||||
p.write_text(json.dumps({"ztAPI": "https://example.invalid"}))
|
||||
|
||||
def _denied(*a, **k):
|
||||
raise PermissionError(13, "Permission denied")
|
||||
|
||||
monkeypatch.setattr("builtins.open", _denied)
|
||||
with pytest.raises(TransportError) as e:
|
||||
_sdk(p)._check_identity_readable()
|
||||
msg = str(e.value)
|
||||
assert "not readable" in msg and "group" in msg
|
||||
|
||||
|
||||
def test_a_good_identity_passes(tmp_path):
|
||||
p = tmp_path / "id.json"
|
||||
p.write_text(json.dumps({"ztAPI": "https://example.invalid"}))
|
||||
_sdk(p)._check_identity_readable() # no raise
|
||||
Reference in New Issue
Block a user