File 0021-systemd-activate-disks-via-systemd-.patch of Package ceph.2107

Overview Repositories Revisions Requests Users Attributes Meta

File 0021-systemd-activate-disks-via-systemd-.patch of Package ceph.2107 (Revision a28f7af3c8d79be307b39b55497d837c)

Currently displaying revision a28f7af3c8d79be307b39b55497d837c , Show latest

From: David Disseldorp <ddiss@suse.de>
Date: Tue, 12 May 2015 01:45:34 +0200
Subject: [PATCH] systemd: activate disks via systemd service instead of udev

The udev(7) man page states:
  RUN
  ...
  This can only be used for very short-running foreground tasks. Running
  an event process for a long period of time may block all further
  events for this or a dependent device.

Starting daemons or other long-running processes is not appropriate
  for udev; the forked processes, detached or not, will be
  unconditionally killed after the event handling has finished.

ceph-disk activate is far from a short-running task:
- check whether path is a block dev, for dirs call through to
  activate_dir()
- call blkid to obtain the filesystem type for the block dev
- pull mount options from hard-coded ceph.conf file
- mount the OSD dev at a temporary path
- check the ceph magic for mounted filesystem
- read cluster uuid and locate corresponding /etc/ceph/{cluster}.conf
  path
- read or generate (if missing) the OSD uuid
- create a file indicating init system usage (systemd)
- mount the device at a second (final) location
- umount (lazy) the temporary mount path
- enable the systemd ceph-osd@{osd_id} service
- start the systemd ceph-osd@{osd_id} service

This logic is therefore best left in a systemd service for execution. As
it is less limited in terms of execution time, and also allows for
improved event handling in future (fsck, dmcrypt mapping etc.).

This change sees 95-ceph-osd.rules.systemd trigger ceph-disk activate or
ceph-disk activate-journal via new ceph-disk-activate-journal@.service,
ceph-disk-activate@.service and ceph-disk-dmcrypt-activate@.service
systemd service files.

ceph-disk-dmcrypt-activate@.service makes use of the newly added
--dmcrypt parameter for ceph-disk activate.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 85a894697e6be1240567f10ba2415eb45e58b22c)
[ddiss@suse.de: rebase without systemd/Makefile.am]
---
 systemd/ceph-disk-activate-journal@.service |  8 ++++++++
 systemd/ceph-disk-activate@.service         |  8 ++++++++
 systemd/ceph-disk-dmcrypt-activate@.service |  8 ++++++++
 udev/95-ceph-osd.rules.systemd              | 28 ++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 systemd/ceph-disk-activate-journal@.service
 create mode 100644 systemd/ceph-disk-activate@.service
 create mode 100644 systemd/ceph-disk-dmcrypt-activate@.service
 create mode 100644 udev/95-ceph-osd.rules.systemd

diff --git a/systemd/ceph-disk-activate-journal@.service b/systemd/ceph-disk-activate-journal@.service
new file mode 100644
index 0000000..ac7cb46
--- /dev/null
+++ b/systemd/ceph-disk-activate-journal@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ceph disk journal activation: %f
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate-journal --mark-init systemd %f
+TimeoutSec=0
diff --git a/systemd/ceph-disk-activate@.service b/systemd/ceph-disk-activate@.service
new file mode 100644
index 0000000..b6e75af
--- /dev/null
+++ b/systemd/ceph-disk-activate@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ceph disk activation: %f
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate --mark-init systemd %f
+TimeoutSec=0
diff --git a/systemd/ceph-disk-dmcrypt-activate@.service b/systemd/ceph-disk-dmcrypt-activate@.service
new file mode 100644
index 0000000..b17df10
--- /dev/null
+++ b/systemd/ceph-disk-dmcrypt-activate@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ceph disk dmcrypt activation: %f
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate --dmcrypt --mark-init systemd %f
+TimeoutSec=0
diff --git a/udev/95-ceph-osd.rules.systemd b/udev/95-ceph-osd.rules.systemd
new file mode 100644
index 0000000..dccfe34
--- /dev/null
+++ b/udev/95-ceph-osd.rules.systemd
@@ -0,0 +1,28 @@
+# activate ceph-tagged partitions
+ACTION=="add", SUBSYSTEM=="block", \
+  ENV{DEVTYPE}=="partition", \
+  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
+  TAG+="systemd", \
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate@/dev/$name.service"
+
+# activate ceph-tagged partitions
+ACTION=="add", SUBSYSTEM=="block", \
+  ENV{DEVTYPE}=="partition", \
+  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-b4b80ceff106", \
+  TAG+="systemd", \
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
+
+# Map journal if using dm-crypt
+ACTION=="add" SUBSYSTEM=="block", \
+  ENV{DEVTYPE}=="partition", \
+  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-5ec00ceff106", \
+  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name"
+
+# Map data device and
+# activate ceph-tagged partitions
+# for dm-crypted data devices
+ACTION=="add" SUBSYSTEM=="block", \
+  ENV{DEVTYPE}=="partition", \
+  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \
+  TAG+="systemd", \
+  ENV{SYSTEMD_WANTS}+="ceph-disk-dmcrypt-activate@/dev/$name.service"

Places

File 0021-systemd-activate-disks-via-systemd-.patch of Package ceph.2107 (Revision a28f7af3c8d79be307b39b55497d837c)

Places