+++ /dev/null
-From 2db844652e8df36adba7ba3b1a334ee583d1a1e1 Mon Sep 17 00:00:00 2001
-From: Dominik Csapak <d.csapak@proxmox.com>
-Date: Tue, 28 May 2019 16:29:21 +0200
-Subject: [PATCH] ceph-volume lvm.zap fix cleanup for db partitions
-
-this uses the correct type 'db' for db type partitions, else
-a block.db parition does not get cleaned up by ceph-volume zap
-
-Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
----
- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py
-index 328a036152..9a7a103ada 100644
---- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py
-+++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py
-@@ -77,7 +77,7 @@ def ensure_associated_lvs(lvs):
- wal_lvs = lvs._filter(lv_tags={'ceph.type': 'wal'})
- backing_devices = [
- (journal_lvs, 'journal'),
-- (db_lvs, 'block'),
-+ (db_lvs, 'db'),
- (wal_lvs, 'wal')
- ]
-
---
-2.20.1
-
index e7a01c6ff8..692705c4c4 100644
--- a/debian/control
+++ b/debian/control
-@@ -188,12 +188,12 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -192,13 +192,13 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
- ceph-mgr-diskprediction-local,
- ceph-mgr-diskprediction-cloud,
- ceph-mgr-rook,
+- ceph-mgr-k8sevents,
- ceph-mgr-ssh
-Suggests: python-influxdb
+Suggests: ceph-mgr-dashboard,
+ ceph-mgr-diskprediction-local,
+ ceph-mgr-diskprediction-cloud,
+ ceph-mgr-rook,
++ ceph-mgr-k8sevents,
+ ceph-mgr-ssh,
+ python-influxdb
Replaces: ceph (<< 0.93-417),
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Igor Fedotov <ifedotov@suse.com>
-Date: Wed, 13 Nov 2019 22:09:53 +0300
-Subject: [PATCH] os/bluestore: consolidate extents from the same device only
-
-Presumably Fixes: https://tracker.ceph.com/issues/42223
-
-Signed-off-by: Igor Fedotov <ifedotov@suse.com>
-(cherry picked from commit 20a90698a262905e97bae771b5950af04c00c67a)
-[ https://github.com/ceph/ceph/pull/31621 ]
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- src/os/bluestore/bluefs_types.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/os/bluestore/bluefs_types.h b/src/os/bluestore/bluefs_types.h
-index fde0384..d841264 100644
---- a/src/os/bluestore/bluefs_types.h
-+++ b/src/os/bluestore/bluefs_types.h
-@@ -91,6 +91,7 @@ struct bluefs_fnode_t {
- void append_extent(const bluefs_extent_t& ext) {
- if (!extents.empty() &&
- extents.back().end() == ext.offset &&
-+ extents.back().bdev == ext.bdev &&
- (uint64_t)extents.back().length + (uint64_t)ext.length < 0xffffffff) {
- extents.back().length += ext.length;
- } else {
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sage Weil <sage@redhat.com>
-Date: Wed, 6 Nov 2019 15:17:53 -0600
-Subject: [PATCH] mgr/devicehealth: do not scrape mon devices
-
-Disable this feature for nautilus because the tell mechanism for mons is
-not reliable. It works in master (octopus), so only disable this in
-the nautilus branch.
-
-This (hopefully!) avoids problems with a hanging mgr that seem to occur
-right when devicehealth is trying to scrape mon devices.
-
-Signed-off-by: Sage Weil <sage@redhat.com>
-(cherry picked from commit d592e56e74d94c6a05b9240fcb0031868acefbab)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- src/pybind/mgr/devicehealth/module.py | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py
-index 2e14ca98a9..c277dde74e 100644
---- a/src/pybind/mgr/devicehealth/module.py
-+++ b/src/pybind/mgr/devicehealth/module.py
-@@ -310,6 +310,8 @@ class Module(MgrModule):
-
- def scrape_daemon(self, daemon_type, daemon_id):
- ioctx = self.open_connection()
-+ if daemon_type != 'osd':
-+ return -errno.EINVAL, '', 'scraping non-OSDs not currently supported'
- raw_smart_data = self.do_scrape_daemon(daemon_type, daemon_id)
- if raw_smart_data:
- for device, raw_data in raw_smart_data.items():
-@@ -326,9 +328,6 @@ class Module(MgrModule):
- ids = []
- for osd in osdmap['osds']:
- ids.append(('osd', str(osd['osd'])))
-- monmap = self.get("mon_map")
-- for mon in monmap['mons']:
-- ids.append(('mon', mon['name']))
- for daemon_type, daemon_id in ids:
- raw_smart_data = self.do_scrape_daemon(daemon_type, daemon_id)
- if not raw_smart_data:
-@@ -347,10 +346,10 @@ class Module(MgrModule):
- r = self.get("device " + devid)
- if not r or 'device' not in r.keys():
- return -errno.ENOENT, '', 'device ' + devid + ' not found'
-- daemons = r['device'].get('daemons', [])
-+ daemons = [d for d in r['device'].get('daemons', []) if not d.startswith('osd.')]
- if not daemons:
- return (-errno.EAGAIN, '',
-- 'device ' + devid + ' not claimed by any active daemons')
-+ 'device ' + devid + ' not claimed by any active OSD daemons')
- (daemon_type, daemon_id) = daemons[0].split('.')
- ioctx = self.open_connection()
- raw_smart_data = self.do_scrape_daemon(daemon_type, daemon_id,
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Fri, 15 Nov 2019 15:22:30 +0100
-Subject: [PATCH] bump version to 14.2.4.1
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4e187f261b..907db98a96 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.5.1)
-
- project(ceph CXX C ASM)
--set(VERSION 14.2.4)
-+set(VERSION 14.2.4.1)
-
- if(POLICY CMP0028)
- cmake_policy(SET CMP0028 NEW)
0002-enable-systemd-targets-by-default.patch
0006-debian-control-add-break-libpvestorage-perl.patch
0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
-0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch
0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
0010-remove-legacy-init.d-ceph-script.patch
0011-only-suggest-mgr-plugins.patch
-0012-os-bluestore-consolidate-extents-from-the-same-devic.patch
-0013-mgr-devicehealth-do-not-scrape-mon-devices.patch
-0014-bump-version-to-14.2.4.1.patch
projects / ceph.git / commitdiff