linux/mdadm
1
0
Fork 0
Code Issues Activity

Adding rediffed patch from ubuntu to randomize md array check timers.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:03:22 +01:00
parent 37f97e85df
commit dd4f1212f1
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
2 changed files with 76 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
debian/patches/debian/0009-randomize-timers.patch vendored Normal file
View file

@ -0,0 +1,75 @@
Author: Dimitri John Ledkov <xnox@ubuntu.com>
Description: Randomize md array check timers (LP: #1815201).
diff -Naurp mdadm.orig/systemd/mdcheck_continue.service mdadm/systemd/mdcheck_continue.service
--- mdadm.orig/systemd/mdcheck_continue.service
+++ mdadm/systemd/mdcheck_continue.service
@@ -13,6 +13,4 @@ Documentation=man:mdadm(8)
[Service]
Type=oneshot
Environment="MDADM_CHECK_DURATION=6 hours"
-EnvironmentFile=-/run/sysconfig/mdadm
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
ExecStart=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION}
diff -Naurp mdadm.orig/systemd/mdcheck_continue.timer mdadm/systemd/mdcheck_continue.timer
--- mdadm.orig/systemd/mdcheck_continue.timer
+++ mdadm/systemd/mdcheck_continue.timer
@@ -9,7 +9,9 @@
Description=MD array scrubbing - continuation
[Timer]
-OnCalendar= 1:05:00
+OnCalendar=daily
+RandomizedDelaySec=12h
+Persistent=true
[Install]
WantedBy= mdmonitor.service
diff -Naurp mdadm.orig/systemd/mdcheck_start.service mdadm/systemd/mdcheck_start.service
--- mdadm.orig/systemd/mdcheck_start.service
+++ mdadm/systemd/mdcheck_start.service
@@ -13,6 +13,4 @@ Documentation=man:mdadm(8)
[Service]
Type=oneshot
Environment="MDADM_CHECK_DURATION=6 hours"
-EnvironmentFile=-/run/sysconfig/mdadm
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
ExecStart=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION}
diff -Naurp mdadm.orig/systemd/mdcheck_start.timer mdadm/systemd/mdcheck_start.timer
--- mdadm.orig/systemd/mdcheck_start.timer
+++ mdadm/systemd/mdcheck_start.timer
@@ -10,6 +10,8 @@ Description=MD array scrubbing
[Timer]
OnCalendar=Sun *-*-1..7 1:00:00
+RandomizedDelaySec=24h
+Persistent=true
[Install]
WantedBy= mdmonitor.service
diff -Naurp mdadm.orig/systemd/mdmonitor-oneshot.service mdadm/systemd/mdmonitor-oneshot.service
--- mdadm.orig/systemd/mdmonitor-oneshot.service
+++ mdadm/systemd/mdmonitor-oneshot.service
@@ -10,7 +10,4 @@ Description=Reminder for degraded MD arr
Documentation=man:mdadm(8)
[Service]
-Environment=MDADM_MONITOR_ARGS=--scan
-EnvironmentFile=-/run/sysconfig/mdadm
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
-ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS
+ExecStart=BINDIR/mdadm --monitor --oneshot --scan
diff -Naurp mdadm.orig/systemd/mdmonitor-oneshot.timer mdadm/systemd/mdmonitor-oneshot.timer
--- mdadm.orig/systemd/mdmonitor-oneshot.timer
+++ mdadm/systemd/mdmonitor-oneshot.timer
@@ -9,7 +9,9 @@
Description=Reminder for degraded MD arrays
[Timer]
-OnCalendar= 2:00:00
+OnCalendar=daily
+RandomizedDelaySec=24h
+Persistent=true
[Install]
WantedBy= mdmonitor.service

1
debian/patches/series vendored
View file

@ -6,3 +6,4 @@ debian/0005-sha1-includes.patch
debian/0006-readlink-path.patch
debian/0007-no-Werror.patch
debian/0008-test-installed.patch
debian/0009-randomize-timers.patch