mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-08-17 23:00:49 +00:00
99b3812832
caused by 14.2.12, as often ceph upstream just sprinkles dependencies in as they feel, or backport some without adapting them to that versions environemnt... https://github.com/ceph/ceph/pull/22769 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Co-authored-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
105 lines
4.0 KiB
Diff
105 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Date: Thu, 26 Nov 2020 18:09:42 +0000
|
|
Subject: [PATCH] fix service ordering, avoid Before=remote-fs-pre.target
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
systemd/ceph-mds@.service.in | 4 ++--
|
|
systemd/ceph-mgr@.service.in | 4 ++--
|
|
systemd/ceph-mon@.service.in | 4 ++--
|
|
systemd/ceph-osd@.service.in | 4 ++--
|
|
systemd/ceph-radosgw@.service.in | 4 ++--
|
|
systemd/rbdmap.service.in | 3 +--
|
|
6 files changed, 11 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
|
|
index e47738a27..eeab101b5 100644
|
|
--- a/systemd/ceph-mds@.service.in
|
|
+++ b/systemd/ceph-mds@.service.in
|
|
@@ -2,8 +2,8 @@
|
|
Description=Ceph metadata server daemon
|
|
PartOf=ceph-mds.target
|
|
After=network-online.target local-fs.target time-sync.target
|
|
-Before=remote-fs-pre.target ceph-mds.target
|
|
-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target
|
|
+Before=ceph-mds.target
|
|
+Wants=network-online.target local-fs.target time-sync.target ceph-mds.target
|
|
|
|
[Service]
|
|
LimitNOFILE=1048576
|
|
diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
|
|
index 0ff9db237..aea3af40a 100644
|
|
--- a/systemd/ceph-mgr@.service.in
|
|
+++ b/systemd/ceph-mgr@.service.in
|
|
@@ -2,8 +2,8 @@
|
|
Description=Ceph cluster manager daemon
|
|
PartOf=ceph-mgr.target
|
|
After=network-online.target local-fs.target time-sync.target
|
|
-Before=remote-fs-pre.target ceph-mgr.target
|
|
-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target
|
|
+Before=ceph-mgr.target
|
|
+Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target
|
|
|
|
[Service]
|
|
LimitNOFILE=1048576
|
|
diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
|
|
index d3121d59d..7992d502a 100644
|
|
--- a/systemd/ceph-mon@.service.in
|
|
+++ b/systemd/ceph-mon@.service.in
|
|
@@ -6,8 +6,8 @@ PartOf=ceph-mon.target
|
|
# these can be removed once ceph-mon will dynamically change network
|
|
# configuration.
|
|
After=network-online.target local-fs.target time-sync.target
|
|
-Before=remote-fs-pre.target ceph-mon.target
|
|
-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target
|
|
+Before=ceph-mon.target
|
|
+Wants=network-online.target local-fs.target time-sync.target ceph-mon.target
|
|
|
|
[Service]
|
|
LimitNOFILE=1048576
|
|
diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
|
|
index 2e5ea6ae4..987656da7 100644
|
|
--- a/systemd/ceph-osd@.service.in
|
|
+++ b/systemd/ceph-osd@.service.in
|
|
@@ -2,8 +2,8 @@
|
|
Description=Ceph object storage daemon osd.%i
|
|
PartOf=ceph-osd.target
|
|
After=network-online.target local-fs.target time-sync.target
|
|
-Before=remote-fs-pre.target ceph-osd.target
|
|
-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target
|
|
+Before=ceph-osd.target
|
|
+Wants=network-online.target local-fs.target time-sync.target ceph-osd.target
|
|
|
|
[Service]
|
|
LimitNOFILE=1048576
|
|
diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
|
|
index dee501b47..d1bcf5bb7 100644
|
|
--- a/systemd/ceph-radosgw@.service.in
|
|
+++ b/systemd/ceph-radosgw@.service.in
|
|
@@ -2,8 +2,8 @@
|
|
Description=Ceph rados gateway
|
|
PartOf=ceph-radosgw.target
|
|
After=network-online.target local-fs.target time-sync.target
|
|
-Before=remote-fs-pre.target ceph-radosgw.target
|
|
-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target
|
|
+Before=ceph-radosgw.target
|
|
+Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target
|
|
|
|
[Service]
|
|
LimitNOFILE=1048576
|
|
diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
|
|
index 6644508cf..96f7d54e7 100644
|
|
--- a/systemd/rbdmap.service.in
|
|
+++ b/systemd/rbdmap.service.in
|
|
@@ -1,8 +1,7 @@
|
|
[Unit]
|
|
Description=Map RBD devices
|
|
After=network-online.target ceph.target
|
|
-Before=remote-fs-pre.target
|
|
-Wants=network-online.target remote-fs-pre.target ceph.target
|
|
+Wants=network-online.target ceph.target
|
|
|
|
[Service]
|
|
EnvironmentFile=-@SYSTEMD_ENV_FILE@
|