diff options
| author | Loic Dachary <ldachary@redhat.com> | 2016-06-23 09:23:09 +0200 |
|---|---|---|
| committer | Loic Dachary <ldachary@redhat.com> | 2016-06-23 09:37:05 +0200 |
| commit | 35004a628b2969d8b2f1c02155bb235165a1d809 (patch) | |
| tree | 1413481a497ac5630a58e021f901e1a99c9027c7 /debian | |
| parent | Merge pull request #9207 from rjfd/wip-15670 (diff) | |
| download | ceph-35004a628b2969d8b2f1c02155bb235165a1d809.tar.xz ceph-35004a628b2969d8b2f1c02155bb235165a1d809.zip | |
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 <loic@dachary.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/ceph-osd.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index 78c32735515..59d30a16961 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 1213ee5ded1..06491b5b36e 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 |