Merge pull request 'vars-fix-overeager-chache-invalidation' (#3385) from hsjobeki/clan-core:vars-fix-overeager-chache-invalidation into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3385

pkgs/clan-cli/clan_cli/tests/test_vars.py

@@ -942,7 +942,8 @@ def test_dynamic_invalidation(
 ) -> None:
     gen_prefix = "config.clan.core.vars.generators"
 
-    machine = Machine(name="my_machine", flake=Flake(str(flake.path)))
+    clan_flake = Flake(str(flake.path))
+    machine = Machine(name="my_machine", flake=clan_flake)
 
     config = flake.machines[machine.name]
     config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
@@ -962,6 +963,10 @@ def test_dynamic_invalidation(
 
     # this is an abuse
     custom_nix = flake.path / "machines" / machine.name / "hardware-configuration.nix"
+    # Set the validation such that we have a ValidationHash
+    # The validationHash changes every time, if the my_generator.files.my_value.value changes
+    # So every time we re-generate, the dependent_generator should also re-generate.
+    # This however is the case anyways. So i dont understand why we have validationHash here.
     custom_nix.write_text(
         """
         { config, ... }: let
@@ -973,27 +978,34 @@ def test_dynamic_invalidation(
     )
 
     flake.refresh()
-    machine.flush_caches()
+    clan_flake.invalidate_cache()
     monkeypatch.chdir(flake.path)
 
     # before generating, dependent generator validation should be empty; see bogus hardware-configuration.nix above
     # we have to avoid `*.files.value` in this initial select because the generators haven't been run yet
+    # Generators 0: The initial generators before any 'vars generate'
     generators_0 = machine.eval_nix(f"{gen_prefix}.*.{{validationHash}}")
     assert generators_0["dependent_generator"]["validationHash"] is None
 
     # generate both my_generator and (the dependent) dependent_generator
     cli.run(["vars", "generate", "--flake", str(flake.path), machine.name])
-    machine.flush_caches()
+    clan_flake.invalidate_cache()
 
     # after generating once, dependent generator validation should be set
+    # Generators_1: The generators after the first 'vars generate'
     generators_1 = machine.eval_nix(gen_prefix)
     assert generators_1["dependent_generator"]["validationHash"] is not None
 
-    # after generating once, neither generator should want to run again because `clan vars generate` should have re-evaluated the dependent generator's validationHash after executing the parent generator but before executing the dependent generator
+    # @tangential: after generating once, neither generator should want to run again because `clan vars generate` should have re-evaluated the dependent generator's validationHash after executing the parent generator but before executing the dependent generator
     # this ensures that validation can depend on parent generators while still only requiring a single pass
+    #
+    # @hsjobeki: The above sentence is incorrect we don't re-evaluate in between generator runs.
+    # Otherwise we would need to evaluate all machines N-times. Resulting in M*N evaluations each beeing very expensive.
+    # Machine evaluation is highly expensive .
+    # The generator will thus run again, and produce a different result in the second run.
     cli.run(["vars", "generate", "--flake", str(flake.path), machine.name])
-    machine.flush_caches()
-
+    clan_flake.invalidate_cache()
+    # Generators_2: The generators after the second 'vars generate'
     generators_2 = machine.eval_nix(gen_prefix)
     assert (
         generators_1["dependent_generator"]["validationHash"]
@@ -1003,7 +1015,10 @@ def test_dynamic_invalidation(
         generators_1["my_generator"]["files"]["my_value"]["value"]
         == generators_2["my_generator"]["files"]["my_value"]["value"]
     )
+    # The generator value will change on the second run. Because the validationHash changes after the generation.
+    # Previously: it changed during generation because we would re-evaluate the flake N-times after each generator was settled.
+    # Due to performance reasons, we cannot do this anymore
     assert (
         generators_1["dependent_generator"]["files"]["my_value"]["value"]
-        == generators_2["dependent_generator"]["files"]["my_value"]["value"]
+        != generators_2["dependent_generator"]["files"]["my_value"]["value"]
     )

pkgs/clan-cli/clan_cli/vars/generate.py

@@ -266,8 +266,6 @@ def execute_generator(
         machine.flake_dir,
         f"Update vars via generator {generator.name} for machine {machine.name}",
     )
-    if len(files_to_commit) > 0:
-        machine.flush_caches()
 
 
 def _ask_prompts(
@@ -526,7 +524,11 @@ def generate_command(args: argparse.Namespace) -> None:
             f"clanInternals.machines.{system}.{{{','.join(machine_names)}}}.config.system.clan.deployment.file",
         ]
     )
-    generate_vars(machines, args.generator, args.regenerate, no_sandbox=args.no_sandbox)
+    has_changed = generate_vars(
+        machines, args.generator, args.regenerate, no_sandbox=args.no_sandbox
+    )
+    if has_changed:
+        args.flake.invalidate_cache()
 
 
 def register_generate_parser(parser: argparse.ArgumentParser) -> None:

pkgs/generate-test-vars/generate_test_vars/cli.py

@@ -22,7 +22,7 @@ sops_priv_key = (
 sops_pub_key = "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
 
 
-def machine_names(repo_root: Path, check_attr: str) -> list[str]:
+def get_machine_names(repo_root: Path, check_attr: str) -> list[str]:
     """
     Get the machine names from the test flake
     """
@@ -133,12 +133,22 @@ def main() -> None:
     shutil.rmtree(test_dir / "sops", ignore_errors=True)
 
     flake = Flake(str(opts.repo_root))
-    machines = [
-        TestMachine(name, flake, test_dir, opts.check_attr)
-        for name in machine_names(
+    machine_names = get_machine_names(
         opts.repo_root,
         opts.check_attr,
     )
+
+    config = nix_config()
+    system = config["system"]
+    flake.precache(
+        [
+            f"checks.{system}.{opts.check_attr}.nodes.{{{','.join(machine_names)}}}.config.clan.core.vars.generators.*.validationHash",
+            f"checks.{system}.{opts.check_attr}.nodes.{{{','.join(machine_names)}}}.config.system.clan.deployment.file",
+        ]
+    )
+
+    machines = [
+        TestMachine(name, flake, test_dir, opts.check_attr) for name in machine_names
     ]
     user = "admin"
     admin_key_path = Path(test_dir.resolve() / "sops" / "users" / user / "key.json")