run_auto_maintenance(): implicitly close the object store

dscho · gitster · commit 5a22a334cb75 · 2021-09-09T12:56:11.000-07:00
Before spawning the auto maintenance, we need to make sure that we
release all open file handles to all the `.pack` files (and MIDX files
and commit-graph files and...) so that the maintenance process has the
freedom to delete those files.

So far, we did this manually every time before calling
`run_auto_maintenance()`. With the new `close_object_store` flag, we can
do that implicitly in that function, which is more robust because future
callers won't be able to forget to close the object store.

Note: this changes behavior slightly, as we previously _always_ closed
the object store, but now we only close the object store when actually
running the auto maintenance. In practice, this should not matter (if
anything, it might speed up operations where auto maintenance is
disabled).

Suggested-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/am.c b/builtin/am.c
@@ -1848,7 +1848,6 @@ static void am_run(struct am_state *state, int resume)
 	 */
 	if (!state->rebasing) {
 		am_destroy(state);
-		close_object_store(the_repository->objects);
 		run_auto_maintenance(state->quiet);
 	}
 }
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -2133,8 +2133,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 					     NULL);
 	}
 
-	close_object_store(the_repository->objects);
-
 	if (enable_auto_gc)
 		run_auto_maintenance(verbosity < 0);
 
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -469,7 +469,6 @@ static void finish(struct commit *head_commit,
 			 * We ignore errors in 'gc --auto', since the
 			 * user should see them.
 			 */
-			close_object_store(the_repository->objects);
 			run_auto_maintenance(verbosity < 0);
 		}
 	}
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -740,7 +740,6 @@ static int finish_rebase(struct rebase_options *opts)
 	delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 	unlink(git_path_auto_merge(the_repository));
 	apply_autostash(state_dir_path("autostash", opts));
-	close_object_store(the_repository->objects);
 	/*
 	 * We ignore errors in 'git maintenance run --auto', since the
 	 * user should see them.
diff --git a/run-command.c b/run-command.c
@@ -1891,6 +1891,7 @@ int run_auto_maintenance(int quiet)
 		return 0;
 
 	maint.git_cmd = 1;
+	maint.close_object_store = 1;
 	strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL);
 	strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet");
 

Original file line number	Diff line number	Diff line change
`@@ -1848,7 +1848,6 @@ static void am_run(struct am_state *state, int resume)`
`1848`	`1848`	`*/`
`1849`	`1849`	`if (!state->rebasing) {`
`1850`	`1850`	`am_destroy(state);`
`1851`		`- close_object_store(the_repository->objects);`
`1852`	`1851`	`run_auto_maintenance(state->quiet);`
`1853`	`1852`	`}`
`1854`	`1853`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2133,8 +2133,6 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`2133`	`2133`	`NULL);`
`2134`	`2134`	`}`
`2135`	`2135`
`2136`		`- close_object_store(the_repository->objects);`
`2137`		`-`
`2138`	`2136`	`if (enable_auto_gc)`
`2139`	`2137`	`run_auto_maintenance(verbosity < 0);`
`2140`	`2138`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,6 @@ static void finish(struct commit *head_commit,`
`469`	`469`	`* We ignore errors in 'gc --auto', since the`
`470`	`470`	`* user should see them.`
`471`	`471`	`*/`
`472`		`- close_object_store(the_repository->objects);`
`473`	`472`	`run_auto_maintenance(verbosity < 0);`
`474`	`473`	`}`
`475`	`474`	`}`