This is based on ds/maintenance-part-2 and replaces the RFC from [1]. [1] https://lore.kernel.org/git/pull.680.v3.git.1598629517.gitgitgadget@xxxxxxxxx/ This series introduces background maintenance to Git, through an integration with cron and crontab. Some preliminary work is done to allow a new --schedule option that tells the command which tasks to run based on a maintenance.<task>.schedule config option. The timing is not enforced by Git, but instead is expected to be provided as a hint from a cron schedule. The options are "hourly", "daily", and "weekly". A new for-each-repo builtin runs Git commands on every repo in a given list. Currently, the list is stored as a config setting, allowing a new maintenance.repos config list to store the repositories registered for background maintenance. Others may want to add a --file=<file> option for their own workflows, but I focused on making this as simple as possible for now. The updates to the git maintenance builtin include new register/unregister subcommands and start/stop subcommands. The register subcommand initializes the config while the start subcommand does everything register does plus update the cron table. The unregister and stop commands reverse this process. A troubleshooting guide is added to Documentation/git-maintenance.txt to advise expert users who choose to create custom cron schedules. The very last patch is entirely optional. It sets a recommended schedule based on my own experience with very large repositories. I'm open to other suggestions, but these are ones that I think work well and don't cause a "rewrite the world" scenario like running nightly 'gc' would do. I've been testing this scenario on my macOS laptop and Linux desktop. I have modified my cron task to provide logging via trace2 so I can see what's happening. A future direction here would be to add some maintenance logs to the repository so we can track what is happening and diagnose whether the maintenance strategy is working on real repos. Note: git maintenance (start|stop) only works on machines with cron by design. The proper thing to do on Windows will come later. Perhaps this command should be marked as unavailable on Windows somehow, or at least a better error than "cron may not be available on your system". I did find that that message is helpful sometimes: macOS worker agents for CI builds typically do not have cron available. Updates in v2: * Fixed the char/int issue in test-tool crontab, and a typo. * Updated commit message and patch noise in PATCH 2 * This should fix the test failures, allowing this to be picked up in 'seen'. Derrick Stolee (7): maintenance: optionally skip --auto process maintenance: add --schedule option and config for-each-repo: run subcommands on configured repos maintenance: add [un]register subcommands maintenance: add start/stop subcommands maintenance: recommended schedule in register/start maintenance: add troubleshooting guide to docs .gitignore | 1 + Documentation/config/maintenance.txt | 10 + Documentation/git-for-each-repo.txt | 59 ++++++ Documentation/git-maintenance.txt | 88 +++++++- Makefile | 2 + builtin.h | 1 + builtin/for-each-repo.c | 58 ++++++ builtin/gc.c | 289 ++++++++++++++++++++++++++- command-list.txt | 1 + git.c | 1 + run-command.c | 6 + t/helper/test-crontab.c | 35 ++++ t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/t0068-for-each-repo.sh | 30 +++ t/t7900-maintenance.sh | 114 ++++++++++- t/test-lib.sh | 6 + 17 files changed, 697 insertions(+), 6 deletions(-) create mode 100644 Documentation/git-for-each-repo.txt create mode 100644 builtin/for-each-repo.c create mode 100644 t/helper/test-crontab.c create mode 100755 t/t0068-for-each-repo.sh base-commit: 6f11fba53777584b94dd9ed32976c2079d645fa2 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-724%2Fderrickstolee%2Fmaintenance%2Fscheduled-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-724/derrickstolee/maintenance/scheduled-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/724 Range-diff vs v1: 1: bd95729009 = 1: b21cd68c90 maintenance: optionally skip --auto process 2: 1783e80b8d ! 2: e2d14d66d4 maintenance: add --schedule option and config @@ Metadata ## Commit message ## maintenance: add --schedule option and config - A user may want to run certain maintenance tasks based on frequency, not - conditions given in the repository. For example, the user may want to - perform a 'prefetch' task every hour, or 'gc' task every day. To assist, - update the 'git maintenance run' command to include a - '--schedule=<frequency>' option. The allowed frequencies are 'hourly', - 'daily', and 'weekly'. These values are also allowed in a new config - value 'maintenance.<task>.schedule'. + Maintenance currently triggers when certain data-size thresholds are + met, such as number of pack-files or loose objects. Users may want to + run certain maintenance tasks based on frequency instead. For example, + a user may want to perform a 'prefetch' task every hour, or 'gc' task + every day. To help these users, update the 'git maintenance run' command + to include a '--schedule=<frequency>' option. The allowed frequencies + are 'hourly', 'daily', and 'weekly'. These values are also allowed in a + new config value 'maintenance.<task>.schedule'. The 'git maintenance run --schedule=<frequency>' checks the '*.schedule' config value for each enabled task to see if the configured frequency is @@ Commit message The following cron table would run the scheduled tasks with the correct frequencies: - 0 1-23 * * * git -C <repo> maintenance run --scheduled=hourly - 0 0 * * 1-6 git -C <repo> maintenance run --scheduled=daily - 0 0 * * 0 git -C <repo> maintenance run --scheduled=weekly + 0 1-23 * * * git -C <repo> maintenance run --schedule=hourly + 0 0 * * 1-6 git -C <repo> maintenance run --schedule=daily + 0 0 * * 0 git -C <repo> maintenance run --schedule=weekly - This cron schedule will run --scheduled=hourly every hour except at - midnight. This avoids a concurrent run with the --scheduled=daily that + This cron schedule will run --schedule=hourly every hour except at + midnight. This avoids a concurrent run with the --schedule=daily that runs at midnight every day except the first day of the week. This avoids - a concurrent run with the --scheduled=weekly that runs at midnight on - the first day of the week. Since --scheduled=daily also runs the - 'hourly' tasks and --scheduled=weekly runs the 'hourly' and 'daily' + a concurrent run with the --schedule=weekly that runs at midnight on + the first day of the week. Since --schedule=daily also runs the + 'hourly' tasks and --schedule=weekly runs the 'hourly' and 'daily' tasks, we will still see all tasks run with the proper frequencies. Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> @@ builtin/gc.c: struct maintenance_task { int selected_order; }; @@ builtin/gc.c: static int maintenance_run_tasks(struct maintenance_run_opts *opts) + !tasks[i].auto_condition())) continue; - if (opts->auto_flag && -- (!tasks[i].auto_condition || -- !tasks[i].auto_condition())) -+ (!tasks[i].auto_condition || !tasks[i].auto_condition())) ++ if (opts->schedule && tasks[i].schedule < opts->schedule) + continue; + -+ if (opts->schedule && tasks[i].schedule < opts->schedule) - continue; - trace2_region_enter("maintenance", tasks[i].name, r); + if (tasks[i].fn(opts)) { + error(_("task '%s' failed"), tasks[i].name); @@ builtin/gc.c: static void initialize_task_config(void) for (i = 0; i < TASK__COUNT; i++) { 3: 6082d939eb = 3: 41a346dfbb for-each-repo: run subcommands on configured repos 4: b7775b3aaf = 4: 1f49cda18e maintenance: add [un]register subcommands 5: e02641881d ! 5: e9b2a39c1d maintenance: add start/stop subcommands @@ t/helper/test-crontab.c (new) +/* + * Usage: test-tool cron <file> [-l] + * -+ * If -l is specified, then write the contents of <file> to stdou. ++ * If -l is specified, then write the contents of <file> to stdout. + * Otherwise, write from stdin into <file>. + */ +int cmd__crontab(int argc, const char **argv) +{ -+ char a; ++ int a; + FILE *from, *to; + + if (argc == 3 && !strcmp(argv[2], "-l")) { 6: 8a285e00e6 = 6: f609c1bde2 maintenance: recommended schedule in register/start 7: c00de53906 = 7: 2344eff4ba maintenance: add troubleshooting guide to docs -- gitgitgadget
