850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 5c4b3b9aa9f576305b36d5ccbd4b929b51307ce9 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.com>
|
|
Date: Thu, 20 Apr 2017 12:40:05 +1000
|
|
Subject: [PATCH] systemd/mdadm-last-resort: use ConditionPathExists instead of
|
|
Conflicts
|
|
|
|
Commit cec72c071bbe ("systemd/mdadm-last-resort: add Conflicts to .service file.")
|
|
|
|
added a 'Conflicts' directive to the mdadm-last-resort@.service file in
|
|
the hope that this would make sure the service didn't run after the device
|
|
was active, even if the timer managed to get started, which is possible in
|
|
race conditions.
|
|
|
|
This seemed to work is testing, but it isn't clear why, and it is known
|
|
to cause problems.
|
|
If systemd happens to know that the mentioned device is a dependency of a
|
|
mount point, the Conflicts can unmount that mountpoint, which is certainly
|
|
not wanted.
|
|
|
|
So remove the "Conflicts" and instead use
|
|
ConditionPathExists=!/sys/devices/virtual/block/%i/md/sync_action
|
|
|
|
The "sync_action" file exists for any array which requires last-resort
|
|
handling, and only appears when the array is activated. So it is safe
|
|
to rely on it to determine if the last-resort is really needed.
|
|
|
|
Fixes: cec72c071bbe ("systemd/mdadm-last-resort: add Conflicts to .service file.")
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
systemd/mdadm-last-resort@.service | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/systemd/mdadm-last-resort@.service b/systemd/mdadm-last-resort@.service
|
|
index e93d72b..f9d4d12 100644
|
|
--- a/systemd/mdadm-last-resort@.service
|
|
+++ b/systemd/mdadm-last-resort@.service
|
|
@@ -1,7 +1,7 @@
|
|
[Unit]
|
|
Description=Activate md array even though degraded
|
|
DefaultDependencies=no
|
|
-Conflicts=sys-devices-virtual-block-%i.device
|
|
+ConditionPathExists=!/sys/devices/virtual/block/%i/md/sync_action
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
--
|
|
2.10.2
|
|
|