From cb0157bcf8682eaf75c8e608a9efb3c861e4235f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 10 Oct 2017 10:22:46 +0200 Subject: [PATCH] cherry-pick OSD activation fix the ceph-osd@ID services should not be enabled persistently, as they get enabled and started via UDEV/ceph.service -> ceph-disk. --- ...untime-omission-for-ceph-osd-service.patch | 36 +++++++++++++++++++ patches/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch diff --git a/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch new file mode 100644 index 000000000..7720a8dae --- /dev/null +++ b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch @@ -0,0 +1,36 @@ +From 67f56c5d882c8e4bed3d404825da3454732ca32a Mon Sep 17 00:00:00 2001 +From: Carl Xiong +Date: Fri, 22 Sep 2017 11:55:33 +0800 +Subject: [PATCH 5/5] ceph-disk: fix '--runtime' omission for ceph-osd service +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +f425a127b introduces a regression that ceph-disk omits "--runtime" when +enabling ceph-osd@$ID.service units for device-backed OSDs. + +Fixes: http://tracker.ceph.com/issues/21498 + +Signed-off-by: Carl Xiong +(cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd) +Signed-off-by: Fabian Grünbichler +--- + src/ceph-disk/ceph_disk/main.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py +index 8b0c5dbc38..6482ba7dee 100755 +--- a/src/ceph-disk/ceph_disk/main.py ++++ b/src/ceph-disk/ceph_disk/main.py +@@ -3248,7 +3248,7 @@ def systemd_start( + osd_id, + ): + systemd_disable(path, osd_id) +- if is_mounted(path): ++ if os.path.ismount(path): + style = ['--runtime'] + else: + style = [] +-- +2.14.1 + diff --git a/patches/series b/patches/series index 1be317a38..cae4f2a23 100644 --- a/patches/series +++ b/patches/series @@ -2,3 +2,4 @@ 0002-cmake-disable-version-from-git.patch 0003-enable-systemd-targets-by-default.patch 0004-msg-async-rdma-uninitialized-variable-fix.patch +0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch -- 2.39.2