1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00

scripts: add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service

We need to have Ceph RBD devices mapped first before use in a stack
where LVM is on top so make sure rbdmap.service is called before
generated lvm2-activation-net.service.

On shutdown, we need to stop blk-availability first before we stop the
rbdmap.service.

Resolves: rhbz1623479
This commit is contained in:
Peter Rajnoha 2018-08-30 12:35:58 +02:00
parent fade9ca3b6
commit cb17ef221b
3 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,6 @@
Version 3.0.0 Version 3.0.0
============= =============
Add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service.
Reduce max concurrent aios to avoid EMFILE with many devices. Reduce max concurrent aios to avoid EMFILE with many devices.
Fix lvconvert conversion attempts to linear. Fix lvconvert conversion attempts to linear.
Fix lvconvert raid0/raid0_meta -> striped regression. Fix lvconvert raid0/raid0_meta -> striped regression.

View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=Availability of block devices Description=Availability of block devices
After=lvm2-activation.service lvm2-lvmetad.service iscsi-shutdown.service iscsi.service iscsid.service fcoe.service After=lvm2-activation.service lvm2-lvmetad.service iscsi-shutdown.service iscsi.service iscsid.service fcoe.service rbdmap.service
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target

View File

@ -160,7 +160,7 @@ static int generate_unit(struct generator *gen, int unit)
"SourcePath=/etc/lvm/lvm.conf\n" "DefaultDependencies=no\n", f); "SourcePath=/etc/lvm/lvm.conf\n" "DefaultDependencies=no\n", f);
if (unit == UNIT_NET) { if (unit == UNIT_NET) {
fprintf(f, "After=%s iscsi.service fcoe.service\n" fprintf(f, "After=%s iscsi.service fcoe.service rbdmap.service\n"
"Before=remote-fs-pre.target shutdown.target\n\n" "Before=remote-fs-pre.target shutdown.target\n\n"
"[Service]\n" "[Service]\n"
"ExecStartPre=/usr/bin/udevadm settle\n", _unit_names[UNIT_MAIN]); "ExecStartPre=/usr/bin/udevadm settle\n", _unit_names[UNIT_MAIN]);