Skip to content

Various cache fixes #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behrmann merged 3 commits into from
Jan 29, 2025
Merged

Various cache fixes #3446

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b6121a
Replace check_uid with a "tools" image check in have_cache()
DaanDeMeyer Jan 28, 2025
b0265d7
Make sure previous cache entries are gone in save_cache()
DaanDeMeyer Jan 28, 2025
daa20dd
Don't call have_cache() in reuse_cache()
DaanDeMeyer Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions mkosi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3043,6 +3043,7 @@ def save_cache(context: Context) -> None:
final, build, manifest = cache_tree_paths(context.config)

with complete_step("Installing cache copies"):
rmtree(final)
move_tree(
context.root,
final,
Expand All @@ -3051,6 +3052,7 @@ def save_cache(context: Context) -> None:
)

if need_build_overlay(context.config) and (context.workspace / "build-overlay").exists():
rmtree(build)
move_tree(
context.workspace / "build-overlay",
build,
Expand All @@ -3068,7 +3070,7 @@ def save_cache(context: Context) -> None:
)


def have_cache(config: Config, check_uid: bool = True) -> bool:
def have_cache(config: Config) -> bool:
if not config.incremental or config.base_trees or config.overlay:
return False

Expand All @@ -3077,7 +3079,7 @@ def have_cache(config: Config, check_uid: bool = True) -> bool:
logging.debug(f"{final} does not exist, not reusing cached images")
return False

if check_uid and (uid := final.stat().st_uid) != os.getuid():
if config.image != "tools" and (uid := final.stat().st_uid) != os.getuid():
logging.debug(
f"{final} uid ({uid}) does not match user uid ({os.getuid()}), not reusing cached images"
)
Expand Down Expand Up @@ -3112,10 +3114,12 @@ def have_cache(config: Config, check_uid: bool = True) -> bool:


def reuse_cache(context: Context) -> bool:
if not have_cache(context.config):
if not context.config.incremental or context.config.base_trees or context.config.overlay:
return False

final, build, _ = cache_tree_paths(context.config)
if not final.exists() or (need_build_overlay(context.config) and not build.exists()):
return False

with complete_step("Copying cached trees"):
copy_tree(
Expand Down Expand Up @@ -4794,7 +4798,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
tools
and (
not (tools.output_dir_or_cwd() / tools.output).exists()
or (tools.incremental and not have_cache(tools, check_uid=False))
or (tools.incremental and not have_cache(tools))
)
and (args.verb != Verb.build or last.output_format == OutputFormat.none)
and not args.force
Expand All @@ -4808,8 +4812,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
# If we're doing an incremental build and the cache is not out of date, don't clean up the
# tools tree so that we can reuse the previous one.
if tools and (
not tools.incremental
or ((args.verb == Verb.build or args.force > 0) and not have_cache(tools, check_uid=False))
not tools.incremental or ((args.verb == Verb.build or args.force > 0) and not have_cache(tools))
):
if tools.incremental == Incremental.strict:
die(
Expand Down
Loading