From 9f77244b8e0782921663e52005b725cca58a8753 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 18 Apr 2016 09:16:02 -0400 Subject: [PATCH] udev: remove 60-ceph-partuuid-workaround-rules These were added to get /dev/disk/by-partuuid/ symlinks to work on wheezy. They are no longer needed for the supported distros (el7+, jessie+, trusty+), and they apparently break dm by opening devices they should not. Fixes: http://tracker.ceph.com/issues/15516 Signed-off-by: Sage Weil --- Makefile.am | 1 - ceph.spec.in | 2 -- debian/ceph-osd.install | 1 - debian/rules | 1 - udev/60-ceph-partuuid-workaround.rules | 37 -------------------------- 5 files changed, 42 deletions(-) delete mode 100644 udev/60-ceph-partuuid-workaround.rules diff --git a/Makefile.am b/Makefile.am index 7734be2bb76c2..81cb29038c68e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ EXTRA_DIST += \ etc/sysconfig/SuSEfirewall2.d/services/ceph-mon \ etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds \ udev/50-rbd.rules \ - udev/60-ceph-partuuid-workaround.rules \ udev/95-ceph-osd.rules \ udev/95-ceph-osd-alt.rules \ share/known_hosts_drop.ceph.com \ diff --git a/ceph.spec.in b/ceph.spec.in index 26928f7b7e875..7b6f63587b686 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -793,7 +793,6 @@ install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildro # udev rules install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules -install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules %if (0%{?rhel} && 0%{?rhel} < 7) install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules @@ -1188,7 +1187,6 @@ fi %{_sbindir}/ceph-disk %{_sbindir}/ceph-disk-udev %{_libexecdir}/ceph/ceph-osd-prestart.sh -%{_udevrulesdir}/60-ceph-partuuid-workaround.rules %{_udevrulesdir}/95-ceph-osd.rules %{_mandir}/man8/ceph-clsinfo.8* %{_mandir}/man8/ceph-disk.8* diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index fd93b4dba93a8..78c327355151f 100644 --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -1,5 +1,4 @@ lib/udev/rules.d/95-ceph-osd.rules -lib/udev/rules.d/60-ceph-partuuid-workaround.rules usr/sbin/ceph-disk usr/sbin/ceph-disk-udev usr/bin/ceph-clsinfo diff --git a/debian/rules b/debian/rules index 73be439e4dc65..679747ce9a549 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,6 @@ 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/60-ceph-partuuid-workaround.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-partuuid-workaround.rules install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.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-partuuid-workaround.rules b/udev/60-ceph-partuuid-workaround.rules deleted file mode 100644 index 290596902fac6..0000000000000 --- a/udev/60-ceph-partuuid-workaround.rules +++ /dev/null @@ -1,37 +0,0 @@ -# -# this is a kludge installed by ceph to fix the /dev/disk/by-partuuid -# symlinks on systems with old udev (< 180). it's a stripped down -# version of a newer 60-persistent-storage.rules file that hopefully -# captures the same set of conditions for setting up those symlinks. -# - -# 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" - -# by-partlabel/by-partuuid links (partition metadata) -ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}" -ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="disk/by-partlabel/$env{ID_PART_ENTRY_NAME}" - -# 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"