diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2018-08-30 12:35:58 +0200 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2018-09-05 14:41:55 +0200 |
| commit | 3374a592502ef099d38491b0c2020a6945d825b1 (patch) | |
| tree | 8ea96d214c10be557f3f3d55b3306a82e01e0e2e | |
| parent | 6afb911252adf73c3bce2c708cc647866d144103 (diff) | |
| download | lvm2-3374a592502ef099d38491b0c2020a6945d825b1.tar.gz | |
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
(cherry picked from commit cb17ef221bdefea3625a22c19c6d8f5504441771)
Conflicts:
WHATS_NEW
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | scripts/blk_availability_systemd_red_hat.service.in | 2 | ||||
| -rw-r--r-- | scripts/lvm2_activation_generator_systemd_red_hat.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ Version 2.02.182 - ============================== + Add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service. Fix pvs with lvmetad to avoid too many open files from filter reads. Fix pvscan --cache to avoid too many open files from filter reads. Reduce max concurrent aios to avoid EMFILE with many devices. diff --git a/scripts/blk_availability_systemd_red_hat.service.in b/scripts/blk_availability_systemd_red_hat.service.in index 1198baa2a..9462072cc 100644 --- a/scripts/blk_availability_systemd_red_hat.service.in +++ b/scripts/blk_availability_systemd_red_hat.service.in @@ -1,6 +1,6 @@ [Unit] 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 Conflicts=shutdown.target diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 0f7f89c86..487582f1d 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -128,7 +128,7 @@ static int generate_unit(const char *dir, int unit, int sysinit_needed) "DefaultDependencies=no\n", f); 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" "[Service]\n" "ExecStartPre=/usr/bin/udevadm settle\n", unit_names[UNIT_MAIN]); |