From: Phillip Wood <phillip.wood123@gmail.com>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: gitster@pobox.com, sandals@crustytoothpaste.net,
lenaic@lhuard.fr, Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH v2 6/8] maintenance: use random minute in systemd scheduler
Date: Mon, 14 Aug 2023 12:26:46 +0100 [thread overview]
Message-ID: <5d431d2c-2d2c-4fb5-82ca-b9684523e512@gmail.com> (raw)
In-Reply-To: <e43778d3e408f5a77b01bce13df6f8b037473cc3.1691699987.git.gitgitgadget@gmail.com>
Hi Stolee
This all looks good to me now, I've left a comment on the test but I
think it is probably fine to go in as it is.
> -static int systemd_timer_write_unit_templates(const char *exec_path)
> +/*
> + * Write the schedule information into a git-maintenance@<schedule>.timer
> + * file using a custom minute. This timer file cannot use the templating
> + * system, so we generate a specific file for each.
> + */
Thanks for adding comments to the functions that write the timer and
service files, they really helpful especially for readers who are not
that familiar with systemd.
> +static int systemd_timer_delete_unit_files(void)
> +{
> + systemd_timer_delete_stale_timer_templates();
> +
> + /* Purposefully not short-circuited to make sure all are called. */
> + return systemd_timer_delete_timer_file(SCHEDULE_HOURLY) |
> + systemd_timer_delete_timer_file(SCHEDULE_DAILY) |
> + systemd_timer_delete_timer_file(SCHEDULE_WEEKLY) |
> + systemd_timer_delete_service_template();
Using "|" rather than "||" is a nice touch.
> diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
> index 487e326b3fa..9ffe76729e6 100755
> --- a/t/t7900-maintenance.sh
> +++ b/t/t7900-maintenance.sh
> @@ -744,7 +744,15 @@ test_expect_success 'start and stop Linux/systemd maintenance' '
> # start registers the repo
> git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
>
> - test_systemd_analyze_verify "systemd/user/git-maintenance@.service" &&
> + for schedule in hourly daily weekly
> + do
> + test_path_is_file "systemd/user/git-maintenance@$schedule.timer" || return 1
> + done &&
> + test_path_is_file "systemd/user/git-maintenance@.service" &&
> +
> + test_systemd_analyze_verify "systemd/user/git-maintenance@hourly.service" &&
> + test_systemd_analyze_verify "systemd/user/git-maintenance@daily.service" &&
> + test_systemd_analyze_verify "systemd/user/git-maintenance@weekly.service" &&
As we only write the template service file I'm not sure what we gain by
these three checks but they don't seem to be doing any harm.
Best Wishes
Phillip
next prev parent reply other threads:[~2023-08-14 11:27 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 18:51 [PATCH 0/6] maintenance: schedule maintenance on a random minute Derrick Stolee via GitGitGadget
2023-08-07 18:51 ` [PATCH 1/6] maintenance: add get_random_minute() Derrick Stolee via GitGitGadget
2023-08-07 21:20 ` Taylor Blau
2023-08-07 23:53 ` Junio C Hamano
2023-08-08 0:22 ` Junio C Hamano
2023-08-08 14:48 ` Taylor Blau
2023-08-08 16:34 ` Junio C Hamano
2023-08-08 16:49 ` Junio C Hamano
2023-08-08 20:01 ` Taylor Blau
2023-08-08 17:28 ` Derrick Stolee
2023-08-08 20:04 ` Taylor Blau
2023-08-09 12:17 ` Derrick Stolee
2023-08-09 18:50 ` Junio C Hamano
2023-08-09 20:34 ` Taylor Blau
2023-08-07 18:51 ` [PATCH 2/6] maintenance: use random minute in launchctl scheduler Derrick Stolee via GitGitGadget
2023-08-07 21:23 ` Taylor Blau
2023-08-07 18:51 ` [PATCH 3/6] maintenance: use random minute in Windows scheduler Derrick Stolee via GitGitGadget
2023-08-07 18:51 ` [PATCH 4/6] maintenance: use random minute in cron scheduler Derrick Stolee via GitGitGadget
2023-08-07 18:51 ` [PATCH 5/6] maintenance: swap method locations Derrick Stolee via GitGitGadget
2023-08-07 21:24 ` Taylor Blau
2023-08-07 18:51 ` [PATCH 6/6] maintenance: use random minute in systemd scheduler Derrick Stolee via GitGitGadget
2023-08-07 21:31 ` Taylor Blau
2023-08-08 13:49 ` Derrick Stolee
2023-08-08 20:05 ` Taylor Blau
2023-08-08 9:53 ` Phillip Wood
2023-08-08 13:03 ` Phillip Wood
2023-08-08 13:56 ` Derrick Stolee
2023-08-08 17:24 ` Derrick Stolee
2023-08-09 10:03 ` Phillip Wood
2023-08-08 12:08 ` Phillip Wood
2023-08-08 17:06 ` Derrick Stolee
2023-08-08 17:14 ` Derrick Stolee
2023-08-09 10:00 ` Phillip Wood
2023-08-10 20:39 ` [PATCH v2 0/8] maintenance: schedule maintenance on a random minute Derrick Stolee via GitGitGadget
2023-08-10 20:39 ` [PATCH v2 1/8] maintenance: add get_random_minute() Derrick Stolee via GitGitGadget
2023-08-10 21:25 ` Taylor Blau
2023-08-10 20:39 ` [PATCH v2 2/8] maintenance: use random minute in launchctl scheduler Derrick Stolee via GitGitGadget
2023-08-10 20:39 ` [PATCH v2 3/8] maintenance: use random minute in Windows scheduler Derrick Stolee via GitGitGadget
2023-08-10 20:39 ` [PATCH v2 4/8] maintenance: use random minute in cron scheduler Derrick Stolee via GitGitGadget
2023-08-10 20:39 ` [PATCH v2 5/8] maintenance: swap method locations Derrick Stolee via GitGitGadget
2023-08-10 20:39 ` [PATCH v2 6/8] maintenance: use random minute in systemd scheduler Derrick Stolee via GitGitGadget
2023-08-14 11:26 ` Phillip Wood [this message]
2023-08-10 20:39 ` [PATCH v2 7/8] maintenance: fix systemd schedule overlaps Derrick Stolee via GitGitGadget
2023-08-10 21:22 ` Junio C Hamano
2023-08-14 11:27 ` Phillip Wood
2023-08-10 20:39 ` [PATCH v2 8/8] maintenance: update schedule before config Derrick Stolee via GitGitGadget
2023-08-14 11:28 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d431d2c-2d2c-4fb5-82ca-b9684523e512@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=lenaic@lhuard.fr \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).