[FC-42763] fix multiple trash dirs on one vm

Adjust the merging behaviour of the `serviceConfig` option value by defining the values as lists so that multiple trash directories can be defined per VM. Previously, multiple definitions would collide when merging since they differ. Defining the value as a list makes the option's values mergeable in the indended way.
flyingcircusio · Jan 7, 2025 · 88888a2 · 88888a2
1 parent 23e316e
commit 88888a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.d/20250107_144004_ph_FC_42763_support_multiple_trash_units_on_one_vm.md b/CHANGES.d/20250107_144004_ph_FC_42763_support_multiple_trash_units_on_one_vm.md
@@ -0,0 +1,2 @@
+- Fix using multiple DeploymentTrash Component on a single host breaking the Nix rebuild, especially across different deployments to the same machine.
+  This was because the values for the IOPS read and write Limits in the Systemd serviceConfig attribute set were defined as strings (which cannot be merged unless identical) instead of lists (which can always be merged).
diff --git a/src/batou_ext/file.py b/src/batou_ext/file.py
@@ -194,8 +194,8 @@ def configure(self):
               ];
 
               systemd.services."systemd-tmpfiles-clean".serviceConfig = {
-                IOReadIOPSMax="{{component.trashdir}} {{component.read_iops_limit}}";
-                IOWriteIOPSMax="{{component.trashdir}} {{component.write_iops_limit}}";
+                IOReadIOPSMax=["{{component.trashdir}} {{component.read_iops_limit}}"];
+                IOWriteIOPSMax=["{{component.trashdir}} {{component.write_iops_limit}}"];
               };
             }
         """
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix using multiple DeploymentTrash Component on a single host breaking the Nix rebuild, especially across different deployments to the same machine.
		This was because the values for the IOPS read and write Limits in the Systemd serviceConfig attribute set were defined as strings (which cannot be merged unless identical) instead of lists (which can always be merged).