This series is based on jk/strvec. This patch series contains 11patches that were going to be part of v4 of ds/maintenance [1], but the discussion has gotten really long. To help focus the conversation, I'm splitting out the portions that create and test the 'maintenance' builtin from the additional tasks (prefetch, loose-objects, incremental-repack) that can be brought in later. [1] https://lore.kernel.org/git/pull.671.git.1594131695.gitgitgadget@xxxxxxxxx/ As mentioned before, git gc already plays the role of maintaining Git repositories. It has accumulated several smaller pieces in its long history, including: 1. Repacking all reachable objects into one pack-file (and deleting unreachable objects). 2. Packing refs. 3. Expiring reflogs. 4. Clearing rerere logs. 5. Updating the commit-graph file. 6. Pruning worktrees. While expiring reflogs, clearing rererelogs, and deleting unreachable objects are suitable under the guise of "garbage collection", packing refs and updating the commit-graph file are not as obviously fitting. Further, these operations are "all or nothing" in that they rewrite almost all repository data, which does not perform well at extremely large scales. These operations can also be disruptive to foreground Git commands when git gc --auto triggers during routine use. This series does not intend to change what git gc does, but instead create new choices for automatic maintenance activities, of which git gc remains the only one enabled by default. The new maintenance tasks are: * 'commit-graph' : write and verify a single layer of an incremental commit-graph. * 'loose-objects' : prune packed loose objects, then create a new pack from a batch of loose objects. * 'pack-files' : expire redundant packs from the multi-pack-index, then repack using the multi-pack-index's incremental repack strategy. * 'prefetch' : fetch from each remote, storing the refs in 'refs/prefetch/ /'. The only included tasks are the 'gc' and 'commit-graph' tasks. The rest will follow in a follow-up series. Including the 'commit-graph' task here allows us to build and test features like config settings and the --task= command-line argument. These tasks are all disabled by default, but can be enabled with config options or run explicitly using "git maintenance run --task=". There are additional config options to allow customizing the conditions for which the tasks run during the '--auto' option. Because 'gc' is implemented as a maintenance task, the most dramatic change of this series is to convert the 'git gc --auto' calls into 'git maintenance run --auto' calls at the end of some Git commands. By default, the only change is that 'git gc --auto' will be run below an additional 'git maintenance' process. The 'git maintenance' builtin has a 'run' subcommand so it can be extended later with subcommands that manage background maintenance, such as 'start' or 'stop'. These are not the subject of this series, as it is important to focus on the maintenance activities themselves. Updates since v1 (of this series) ================================= * Documentation fixes. * The builtin code had some slight tweaks in PATCH 1. UPDATES since v3 of [1] ======================= * The biggest change here is the use of "test_subcommand", based on Jonathan Nieder's approach. This requires having the exact command-line figured out, which now requires spelling out all --no- [quiet%7Cprogress] options. I also added a bunch of "2>/dev/null" checks because of the isatty(2) calls. Without that, the behavior will change depending on whether the test is run with -x/-v or without. * The option parsing has changed to use a local struct and pass that struct to the helper methods. This is instead of having a global singleton. Thanks, -Stolee Derrick Stolee (11): maintenance: create basic maintenance runner maintenance: add --quiet option maintenance: replace run_auto_gc() maintenance: initialize task array maintenance: add commit-graph task maintenance: add --task option maintenance: take a lock on the objects directory maintenance: create maintenance.<task>.enabled config maintenance: use pointers to check --auto maintenance: add auto condition for commit-graph task maintenance: add trace2 regions for task execution .gitignore | 1 + Documentation/config.txt | 2 + Documentation/config/maintenance.txt | 14 ++ Documentation/fetch-options.txt | 6 +- Documentation/git-clone.txt | 6 +- Documentation/git-maintenance.txt | 79 ++++++ builtin.h | 1 + builtin/am.c | 2 +- builtin/commit.c | 2 +- builtin/fetch.c | 6 +- builtin/gc.c | 354 +++++++++++++++++++++++++++ builtin/merge.c | 2 +- builtin/rebase.c | 4 +- commit-graph.c | 8 +- commit-graph.h | 1 + git.c | 1 + object.h | 1 + run-command.c | 16 +- run-command.h | 2 +- t/t5510-fetch.sh | 2 +- t/t5514-fetch-multiple.sh | 2 +- t/t7900-maintenance.sh | 63 +++++ t/test-lib-functions.sh | 33 +++ 23 files changed, 580 insertions(+), 28 deletions(-) create mode 100644 Documentation/config/maintenance.txt create mode 100644 Documentation/git-maintenance.txt create mode 100755 t/t7900-maintenance.sh base-commit: d70a9eb611a9d242c1d26847d223b8677609305b Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-695%2Fderrickstolee%2Fmaintenance%2Fbuiltin-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-695/derrickstolee/maintenance/builtin-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/695 Range-diff vs v1: 1: 2b9deb6d6a ! 1: e09e4a4a87 maintenance: create basic maintenance runner @@ Documentation/git-maintenance.txt (new) +----------- +Run tasks to optimize Git repository data, speeding up other Git commands +and reducing storage requirements for the repository. -++ ++ +Git commands that add repository data, such as `git add` or `git fetch`, +are optimized for a responsive user experience. These commands do not take +time to optimize the Git data, since such optimizations scale with the full +size of the repository while these user commands each perform a relatively +small action. -++ ++ +The `git maintenance` command provides flexibility for how to optimize the +Git repository. + @@ Documentation/git-maintenance.txt (new) +----- + +gc:: -+ Cleanup unnecessary files and optimize the local repository. "GC" ++ Clean up unnecessary files and optimize the local repository. "GC" + stands for "garbage collection," but this task performs many -+ smaller tasks. This task can be rather expensive for large -+ repositories, as it repacks all Git objects into a single pack-file. -+ It can also be disruptive in some situations, as it deletes stale -+ data. ++ smaller tasks. This task can be expensive for large repositories, ++ as it repacks all Git objects into a single pack-file. It can also ++ be disruptive in some situations, as it deletes stale data. See ++ linkgit:git-gc[1] for more details on garbage collection in Git. + +OPTIONS +------- @@ builtin/gc.c: int cmd_gc(int argc, const char **argv, const char *prefix) + +int cmd_maintenance(int argc, const char **argv, const char *prefix) +{ -+ static struct maintenance_opts opts; -+ static struct option builtin_maintenance_options[] = { ++ struct maintenance_opts opts; ++ struct option builtin_maintenance_options[] = { + OPT_BOOL(0, "auto", &opts.auto_flag, + N_("run tasks based on the state of the repository")), + OPT_END() @@ builtin/gc.c: int cmd_gc(int argc, const char **argv, const char *prefix) + builtin_maintenance_usage, + PARSE_OPT_KEEP_UNKNOWN); + -+ if (argc == 1) { -+ if (!strcmp(argv[0], "run")) -+ return maintenance_run(&opts); -+ } ++ if (argc != 1) ++ usage_with_options(builtin_maintenance_usage, ++ builtin_maintenance_options); ++ ++ if (!strcmp(argv[0], "run")) ++ return maintenance_run(&opts); + -+ usage_with_options(builtin_maintenance_usage, -+ builtin_maintenance_options); ++ die(_("invalid subcommand: %s"), argv[0]); +} ## git.c ## @@ t/t7900-maintenance.sh (new) + +test_expect_success 'help text' ' + test_expect_code 129 git maintenance -h 2>err && -+ test_i18ngrep "usage: git maintenance run" err ++ test_i18ngrep "usage: git maintenance run" err && ++ test_expect_code 128 git maintenance barf 2>err && ++ test_i18ngrep "invalid subcommand: barf" err +' + +test_expect_success 'run [--auto]' ' 2: d5faef26af ! 2: adae48d235 maintenance: add --quiet option @@ builtin/gc.c: static int maintenance_task_gc(struct maintenance_opts *opts) close_object_store(the_repository->objects); return run_command(&child); @@ builtin/gc.c: int cmd_maintenance(int argc, const char **argv, const char *prefix) - static struct option builtin_maintenance_options[] = { + struct option builtin_maintenance_options[] = { OPT_BOOL(0, "auto", &opts.auto_flag, N_("run tasks based on the state of the repository")), + OPT_BOOL(0, "quiet", &opts.quiet, @@ builtin/gc.c: int cmd_maintenance(int argc, const char **argv, const char *prefi ## t/t7900-maintenance.sh ## @@ t/t7900-maintenance.sh: test_expect_success 'help text' ' - test_i18ngrep "usage: git maintenance run" err + test_i18ngrep "invalid subcommand: barf" err ' -test_expect_success 'run [--auto]' ' 3: 233811310b = 3: 91741a0cfc maintenance: replace run_auto_gc() 4: 7efa23abc8 = 4: 1db3b96280 maintenance: initialize task array 5: 902b742032 ! 5: 50b457fd57 maintenance: add commit-graph task @@ Documentation/git-maintenance.txt: run:: + 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" + Clean up unnecessary files and optimize the local repository. "GC" stands for "garbage collection," but this task performs many ## builtin/gc.c ## @@ t/t7900-maintenance.sh: test_description='git maintenance builtin' + test_expect_success 'help text' ' test_expect_code 129 git maintenance -h 2>err && - test_i18ngrep "usage: git maintenance run" err + test_i18ngrep "usage: git maintenance run" err && 6: dddbcc4f3d ! 6: 85268bd53e maintenance: add --task option @@ builtin/gc.c: static int maintenance_run(struct maintenance_opts *opts) + int cmd_maintenance(int argc, const char **argv, const char *prefix) { - static struct maintenance_opts opts; + struct maintenance_opts opts; @@ builtin/gc.c: int cmd_maintenance(int argc, const char **argv, const char *prefix) N_("run tasks based on the state of the repository")), OPT_BOOL(0, "quiet", &opts.quiet, 7: 79af39be13 = 7: 6f86cfaa94 maintenance: take a lock on the objects directory 8: 69bfc6a4b2 = 8: 5c0f9d69d1 maintenance: create maintenance.<task>.enabled config 9: df21bbb000 = 9: 68bf5bef4b maintenance: use pointers to check --auto 10: e67e259aef = 10: fc097c389a maintenance: add auto condition for commit-graph task 11: a5d1914846 = 11: 46fbe161aa maintenance: add trace2 regions for task execution -- gitgitgadget
