From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
The first new task in the 'git maintenance' builtin is the
'commit-graph' job. It is based on the sequence of events in the
'commit-graph' job in Scalar [1]. This sequence is as follows:
1. git commit-graph write --reachable --split
2. git commit-graph verify --shallow
3. If the verify succeeds, stop.
4. Delete the commit-graph-chain file.
5. git commit-graph write --reachable --split
By writing an incremental commit-graph file using the "--split"
option we minimize the disruption from this operation. The default
behavior is to merge layers until the new "top" layer is less than
half the size of the layer below. This provides quick writes most
of the time, with the longer writes following a power law
distribution.
Most importantly, concurrent Git processes only look at the
commit-graph-chain file for a very short amount of time, so they
will verly likely not be holding a handle to the file when we try
to replace it. (This only matters on Windows.)
If a concurrent process reads the old commit-graph-chain file, but
our job expires some of the .graph files before they can be read,
then those processes will see a warning message (but not fail).
This could be avoided by a future update to use the --expire-time
argument when writing the commit-graph.
By using 'git commit-graph verify --shallow' we can ensure that
the file we just wrote is valid. This is an extra safety precaution
that is faster than our 'write' subcommand. In the rare situation
that the newest layer of the commit-graph is corrupt, we can "fix"
the corruption by deleting the commit-graph-chain file and rewrite
the full commit-graph as a new one-layer commit graph. This does
not completely prevent _that_ file from being corrupt, but it does
recompute the commit-graph by parsing commits from the object
database. In our use of this step in Scalar and VFS for Git, we
have only seen this issue arise because our microsoft/git fork
reverted 43d3561 ("commit-graph write: don't die if the existing
graph is corrupt" 2019-03-25) for a while to keep commit-graph
writes very fast. We dropped the revert when updating to v2.23.0.
The verify still has potential for catching corrupt data across
the layer boundary: if the new file has commit X with parent Y
in an old file but the commit ID for Y in the old file had a
bitswap, then we will notice that in the 'verify' command.
[1] https://github.com/microsoft/scalar/blob/master/Scalar.Common/Maintenance/CommitGraphStep.cs
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Documentation/git-maintenance.txt | 18 ++++++++
builtin/gc.c | 76 ++++++++++++++++++++++++++++++-
commit-graph.c | 8 ++--
commit-graph.h | 1 +
t/t7900-maintenance.sh | 2 +-
5 files changed, 99 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index 089fa4cedc..35b0be7d40 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -35,6 +35,24 @@ run::
TASKS
-----
+commit-graph::
+ The `commit-graph` job updates the `commit-graph` files incrementally,
+ then verifies that the written data is correct. If the new layer has an
+ issue, then the chain file is removed and the `commit-graph` is
+ rewritten from scratch.
++
+The verification only checks the top layer of the `commit-graph` chain.
+If the incremental write merged the new commits with at least one
+existing layer, then there is potential for on-disk corruption being
+carried forward into the new file. This will be noticed and the new
+commit-graph file will be clean as Git reparses the commit data from
+the object database.
++
+The incremental write is safe to run alongside concurrent Git processes
+since it will not expire `.graph` files that were in the previous
+`commit-graph-chain` file. They will be deleted by a later run based on
+the expiration delay.
+
gc::
Cleanup unnecessary files and optimize the local repository. "GC"
stands for "garbage collection," but this task performs many
diff --git a/builtin/gc.c b/builtin/gc.c
index c143bf50df..a6b080627f 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -705,7 +705,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
return 0;
}
-#define MAX_NUM_TASKS 1
+#define MAX_NUM_TASKS 2
static const char * const builtin_maintenance_usage[] = {
N_("git maintenance run [<options>]"),
@@ -717,6 +717,76 @@ struct maintenance_opts {
int quiet;
} opts;
+static int run_write_commit_graph(struct repository *r)
+{
+ int result;
+ struct argv_array cmd = ARGV_ARRAY_INIT;
+
+ argv_array_pushl(&cmd, "-C", r->worktree,
+ "commit-graph", "write",
+ "--split", "--reachable",
+ NULL);
+
+ if (opts.quiet)
+ argv_array_pushl(&cmd, "--no-progress", NULL);
+
+ result = run_command_v_opt(cmd.argv, RUN_GIT_CMD);
+ argv_array_clear(&cmd);
+
+ return result;
+}
+
+static int run_verify_commit_graph(struct repository *r)
+{
+ int result;
+ struct argv_array cmd = ARGV_ARRAY_INIT;
+
+ argv_array_pushl(&cmd, "-C", r->worktree,
+ "commit-graph", "verify",
+ "--shallow", NULL);
+
+ if (opts.quiet)
+ argv_array_pushl(&cmd, "--no-progress", NULL);
+
+ result = run_command_v_opt(cmd.argv, RUN_GIT_CMD);
+ argv_array_clear(&cmd);
+
+ return result;
+}
+
+static int maintenance_task_commit_graph(struct repository *r)
+{
+ char *chain_path;
+
+ /* Skip commit-graph when --auto is specified. */
+ if (opts.auto_flag)
+ return 0;
+
+ close_object_store(r->objects);
+ if (run_write_commit_graph(r)) {
+ error(_("failed to write commit-graph"));
+ return 1;
+ }
+
+ if (!run_verify_commit_graph(r))
+ return 0;
+
+ warning(_("commit-graph verify caught error, rewriting"));
+
+ chain_path = get_commit_graph_chain_filename(r->objects->odb);
+ if (unlink(chain_path)) {
+ UNLEAK(chain_path);
+ die(_("failed to remove commit-graph at %s"), chain_path);
+ }
+ free(chain_path);
+
+ if (!run_write_commit_graph(r))
+ return 0;
+
+ error(_("failed to rewrite commit-graph"));
+ return 1;
+}
+
static int maintenance_task_gc(struct repository *r)
{
int result;
@@ -790,6 +860,10 @@ static void initialize_tasks(void)
tasks[num_tasks]->enabled = 1;
num_tasks++;
+ tasks[num_tasks]->name = "commit-graph";
+ tasks[num_tasks]->fn = maintenance_task_commit_graph;
+ num_tasks++;
+
hashmap_init(&task_map, task_entry_cmp, NULL, MAX_NUM_TASKS);
for (i = 0; i < num_tasks; i++) {
diff --git a/commit-graph.c b/commit-graph.c
index fdd1c4fa7c..57278a9ab5 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -172,7 +172,7 @@ static char *get_split_graph_filename(struct object_directory *odb,
oid_hex);
}
-static char *get_chain_filename(struct object_directory *odb)
+char *get_commit_graph_chain_filename(struct object_directory *odb)
{
return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
}
@@ -520,7 +520,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
struct stat st;
struct object_id *oids;
int i = 0, valid = 1, count;
- char *chain_name = get_chain_filename(odb);
+ char *chain_name = get_commit_graph_chain_filename(odb);
FILE *fp;
int stat_res;
@@ -1635,7 +1635,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
}
if (ctx->split) {
- char *lock_name = get_chain_filename(ctx->odb);
+ char *lock_name = get_commit_graph_chain_filename(ctx->odb);
hold_lock_file_for_update_mode(&lk, lock_name,
LOCK_DIE_ON_ERROR, 0444);
@@ -2012,7 +2012,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
if (ctx->split_opts && ctx->split_opts->expire_time)
expire_time = ctx->split_opts->expire_time;
if (!ctx->split) {
- char *chain_file_name = get_chain_filename(ctx->odb);
+ char *chain_file_name = get_commit_graph_chain_filename(ctx->odb);
unlink(chain_file_name);
free(chain_file_name);
ctx->num_commit_graphs_after = 0;
diff --git a/commit-graph.h b/commit-graph.h
index 28f89cdf3e..3c202748c3 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -25,6 +25,7 @@ struct commit;
struct bloom_filter_settings;
char *get_commit_graph_filename(struct object_directory *odb);
+char *get_commit_graph_chain_filename(struct object_directory *odb);
int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
/*
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index e4e4036e50..216ac0b19e 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -12,7 +12,7 @@ test_expect_success 'help text' '
test_i18ngrep "usage: git maintenance run" err
'
-test_expect_success 'gc [--auto|--quiet]' '
+test_expect_success 'run [--auto|--quiet]' '
GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" git maintenance run --no-quiet &&
GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" git maintenance run --auto &&
GIT_TRACE2_EVENT="$(pwd)/run-quiet.txt" git maintenance run --quiet &&
--
gitgitgadget
