From cc3275c07d788cef42530e0b22dac6d312c5fa3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8E=BD=E4=B8=8D=E7=BE=81?= Date: Fri, 17 May 2024 10:57:25 +0800 Subject: [PATCH 1/3] fix(mgr): TypeError --- 0009-fix-CVE-2022-0670.patch | 2 +- ceph.spec | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/0009-fix-CVE-2022-0670.patch b/0009-fix-CVE-2022-0670.patch index a9c947f..2bacb5f 100644 --- a/0009-fix-CVE-2022-0670.patch +++ b/0009-fix-CVE-2022-0670.patch @@ -90,7 +90,7 @@ index 2840a9f2e..0d183e612 100644 def state(self): """ Subvolume state, one of SubvolumeStates """ - raise NotImplementedError -+ raise SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) ++ return SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) @property def subvol_type(self): diff --git a/ceph.spec b/ceph.spec index f2c14a2..1493d47 100644 --- a/ceph.spec +++ b/ceph.spec @@ -2502,6 +2502,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri May 17 2024 fwind43 - 2:16.2.7-18 +- Fixed error for fs subvolume + * Wed Oct 18 2023 wangzengliang - 2:16.2.7-18 - fix CVE-2023-43040 - sync from #PR 209 -- Gitee From 05140f0058d18769fc6ce1b4dfc6ba2aeaa37c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8E=BD=E4=B8=8D=E7=BE=81?= Date: Fri, 17 May 2024 13:30:36 +0800 Subject: [PATCH 2/3] fix(mgr): TypeError --- ceph.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index 1493d47..7578eb2 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 18 +Release: 19 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -2502,7 +2502,7 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog -* Fri May 17 2024 fwind43 - 2:16.2.7-18 +* Fri May 17 2024 fwind43 - 2:16.2.7-19 - Fixed error for fs subvolume * Wed Oct 18 2023 wangzengliang - 2:16.2.7-18 -- Gitee From 1c5f64b3f390a338fc98c5ee0eeac9ead54572a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8E=BD=E4=B8=8D=E7=BE=81?= Date: Fri, 17 May 2024 10:57:25 +0800 Subject: [PATCH 3/3] fix(mgr): TypeError --- 0009-fix-CVE-2022-0670.patch | 2 +- ceph.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/0009-fix-CVE-2022-0670.patch b/0009-fix-CVE-2022-0670.patch index a9c947f..2bacb5f 100644 --- a/0009-fix-CVE-2022-0670.patch +++ b/0009-fix-CVE-2022-0670.patch @@ -90,7 +90,7 @@ index 2840a9f2e..0d183e612 100644 def state(self): """ Subvolume state, one of SubvolumeStates """ - raise NotImplementedError -+ raise SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) ++ return SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) @property def subvol_type(self): diff --git a/ceph.spec b/ceph.spec index f2c14a2..7578eb2 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 18 +Release: 19 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -2502,6 +2502,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri May 17 2024 fwind43 - 2:16.2.7-19 +- Fixed error for fs subvolume + * Wed Oct 18 2023 wangzengliang - 2:16.2.7-18 - fix CVE-2023-43040 - sync from #PR 209 -- Gitee