Hold out a module whose own composition waits to be applied, so the node's own apply never removes the resources it moved there (issue 1944, issue 1945)

2026-10-25 02:52:10 +02:00
parent db06feed2e
commit 2bfde7d659
2 changed files with 80 additions and 2 deletions
@@ -640,3 +640,39 @@ func TestAHaveWithNoCompositionDefersToTheKeptDeclaration(t *testing.T) {
 		t.Fatalf("applied %v", got)
 	}
 }
+
+// A module that leaves the node's own composition for a composition of its own keeps its resources until that one is
+// applied: the node's own apply holds out every module whose composition the node's bucket holds and the agent does not
+// run yet (issue 1945, live on 2026-10-25 at 02:32: shanks' node-engine applied a node's own composition that no longer
+// carried systemd-resolved, whose own composition waited for its credential, and removed its guard, so the machine lost
+// its resolver).
+func TestTheNodesOwnApplyHoldsOutAModuleThatMovedToItsOwnComposition(t *testing.T) {
+	b := newBed(t)
+	fp := fpOf("b")
+	// systemd-resolved's own composition is written; no want names it yet.
+	rk, rraw, _ := composition(t, "systemd-resolved", fp, false, file("systemd-resolved", "guard", "g"))
+	b.comps.before(rk, rraw)
+	nk, nraw, ndig := composition(t, NodeModule, "", false)
+	nwk, err := delivery.WantNodeKey(node)
+	if err != nil {
+		t.Fatal(err)
+	}
+	nwraw, err := delivery.EncodeNodeWant(delivery.NodeWant{Composed: ndig})
+	if err != nil {
+		t.Fatal(err)
+	}
+	b.comps.before(nk, nraw)
+	b.wants.before(nwk, nwraw)
+	stop := b.run()
+	defer stop()
+	eventually(t, "the node's own not applied", func() bool { return len(b.appliedList()) == 1 })
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	var names []string
+	for _, c := range b.others[0] {
+		names = append(names, c.Module)
+	}
+	if !strings.Contains(strings.Join(names, ","), "systemd-resolved") {
+		t.Fatalf("the others of the node's own apply were %v: systemd-resolved's resources would be removed", names)
+	}
+}