udev: trigger ceph-disk-activate directly from udev

There is no need to depend on upstart for this.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 5bd85ee5aa31bfd1f4f0e434f08c2a19414358ef)

Conflicts:

	ceph.spec.in

diff --git a/Makefile.am b/Makefile.am
index 3f4231438ad6fe7fcc035e54c72cb6fb85b6e4b5..adeb4e577289bf39dcced2a547e23740a0c2898a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ EXTRA_DIST += \
        src/test/run-cli-tests-maybe-unset-ccache \
        src/test/cli \
        src/test/downloads \
-       udev/50-rbd.rules
+       udev/50-rbd.rules \
+       udev/95-ceph-osd.rules
 
 
 all-local:

diff --git a/ceph.spec.in b/ceph.spec.in
index 7aae6fefedba6fc89718d824d5596b7e17609b39..662d582db6191e9b87cf1b5718c2b20cd4056490 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -285,6 +285,10 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/java
 mv $RPM_BUILD_ROOT/usr/lib64/libcephfs.jar  $RPM_BUILD_ROOT/usr/share/java/.
 mv $RPM_BUILD_ROOT/usr/lib64/libcephfs-test.jar $RPM_BUILD_ROOT/usr/share/java/.
 
+# udev rules
+install -D -m 644 udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
+install -D -m 644 udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -385,6 +389,7 @@ fi
 /sbin/ceph-disk-activate
 /sbin/ceph-disk-prepare
 /sbin/ceph-create-keys
+/lib/udev/rules.d/95-ceph-osd.rules
 
 #################################################################################
 %files fuse

diff --git a/debian/ceph.install b/debian/ceph.install
index da097b24c8601618306b186267dd7098d88fba6d..fb70d9b93807fd38fef626a01a8e1b26382bd2a1 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -24,3 +24,4 @@ usr/share/man/man8/monmaptool.8
 usr/share/man/man8/ceph-clsinfo.8
 usr/share/man/man8/ceph-debugpack.8
 etc/bash_completion.d/ceph
+lib/udev/rules.d/95-ceph-osd.rules

diff --git a/debian/rules b/debian/rules
index c7ddbaf8f54d4565d5ce1c4d847333906d59befe..260f27fcd68fdf4b75f800de0feeaf6bb8019c02 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,7 @@ install: build
        $(MAKE) DESTDIR=$(DESTDIR) install
        sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
        install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
+       install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.

diff --git a/src/Makefile.am b/src/Makefile.am
index 94e6de85b2a6585357defb312d695e823223eb87..4291f17962a928f8a06b172eec15275f49597464 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1093,7 +1093,6 @@ EXTRA_DIST += \
        $(srcdir)/upstart/ceph-osd.conf \
        $(srcdir)/upstart/ceph-osd-all.conf \
        $(srcdir)/upstart/ceph-osd-all-starter.conf \
-       $(srcdir)/upstart/ceph-osd-activate.conf \
        $(srcdir)/upstart/ceph-mds.conf \
        $(srcdir)/upstart/ceph-mds-all.conf \
        $(srcdir)/upstart/ceph-mds-all-starter.conf \

diff --git a/src/upstart/ceph-osd-activate.conf b/src/upstart/ceph-osd-activate.conf
deleted file mode 100644 (file)
index db88f01..0000000
--- a/src/upstart/ceph-osd-activate.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-description "Ceph OSD activate/hotplug"
-
-start on block-device-added \
-  DEVTYPE=partition \
-  ID_PART_ENTRY_TYPE=4fbd7e29-9d25-41b8-afd0-062c0ceff05d
-stop on runlevel [!2345]
-
-task
-instance $DEVNAME
-
-exec /usr/sbin/ceph-disk-activate --mark-init upstart --mount "$DEVNAME"

diff --git a/udev/95-ceph-osd.rules b/udev/95-ceph-osd.rules
new file mode 100644 (file)
index 0000000..c3e05bb
--- /dev/null
+++ b/udev/95-ceph-osd.rules
@@ -0,0 +1,5 @@
+# activate ceph-tagged partitions
+ACTION=="add", SUBSYSTEM=="block", \
+  ENV{DEVTYPE}=="partition", \
+  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
+  RUN+="/usr/sbin/ceph-disk-activate --mount /dev/$name"