From 35004a628b2969d8b2f1c02155bb235165a1d809 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 23 Jun 2016 09:23:09 +0200 Subject: [PATCH] udev: always populate /dev/disk/by-parttypeuuid ceph-disk activate-all walks /dev/disk/by-parttypeuuid at boot time. It is not necessary when udev fires ADD event for each partition and 95-ceph-osd.rules gets a chance to activate a ceph disk or journal. There are various reasons why udev ADD events may not be fired at boot (for instance Debian Jessi 8.5 never does it and CentOS 7.2 seems to be racy in that regard when a LVM root is being used). Populating /dev/disk/by-parttypeuuid fixes ceph-disk activate-all that would not work without it. And it guarantees disks are activated at boot time regardless of wether udev fires ADD events at the right time (or at all). The new udev file is a partial resurection of the 60-ceph-partuuid-workaround-rules that was removed by 9f77244b8e0782921663e52005b725cca58a8753. It is given a name that reflects its new purpose. Fixes http://tracker.ceph.com/issues/16351 Signed-off-by: Loic Dachary --- Makefile.am | 1 + ceph.spec.in | 1 + debian/ceph-osd.install | 1 + debian/rules | 1 + udev/60-ceph-by-parttypeuuid.rules | 31 ++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 udev/60-ceph-by-parttypeuuid.rules diff --git a/Makefile.am b/Makefile.am index ca08942d232d2..b1d8d949a0b82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ EXTRA_DIST += \ etc/sysconfig/SuSEfirewall2.d/services/ceph-mon \ etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds \ udev/50-rbd.rules \ + udev/60-ceph-by-parttypeuuid.rules \ udev/95-ceph-osd.rules \ share/known_hosts_drop.ceph.com \ share/id_dsa_drop.ceph.com \ diff --git a/ceph.spec.in b/ceph.spec.in index 10687fc893edd..d0be2216d85f2 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -711,6 +711,7 @@ install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildro # udev rules install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules +install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules #set up placeholder directories diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index 78c327355151f..59d30a16961d0 100644 --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -1,4 +1,5 @@ lib/udev/rules.d/95-ceph-osd.rules +lib/udev/rules.d/60-ceph-by-parttypeuuid.rules usr/sbin/ceph-disk usr/sbin/ceph-disk-udev usr/bin/ceph-clsinfo diff --git a/debian/rules b/debian/rules index 1213ee5ded19b..06491b5b36eff 100755 --- a/debian/rules +++ b/debian/rules @@ -80,6 +80,7 @@ install: build $(MAKE) DESTDIR=$(DESTDIR) install 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 + install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap diff --git a/udev/60-ceph-by-parttypeuuid.rules b/udev/60-ceph-by-parttypeuuid.rules new file mode 100644 index 0000000000000..1fe8fc54736ce --- /dev/null +++ b/udev/60-ceph-by-parttypeuuid.rules @@ -0,0 +1,31 @@ +# +# Make sure /dev/disk/by-parttypeuuid is populated because +# ceph-disk activate-all relies on it. +# + +# forward scsi device event to corresponding block device +ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" + +ACTION=="remove", GOTO="persistent_storage_end_two" + +SUBSYSTEM!="block", GOTO="persistent_storage_end_two" + +# skip rules for inappropriate block devices +KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|md*", GOTO="persistent_storage_end_two" + +# ignore partitions that span the entire disk +TEST=="whole_disk", GOTO="persistent_storage_end_two" + +# for partitions import parent information +ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" + +# skip unpartitioned removable media devices from drivers which do not send "change" events +ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end_two" + +# probe filesystem metadata of disks +KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" + +# NEW: by-parttypeuuid links (type.id) +ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_TYPE}=="?*", ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-parttypeuuid/$env{ID_PART_ENTRY_TYPE}.$env{ID_PART_ENTRY_UUID}" + +LABEL="persistent_storage_end_two"