From 87852ee8792d61859d21a658317e2e2a00fc73d6 Mon Sep 17 00:00:00 2001 From: yangxiaoliang <154920043@qq.com> Date: Fri, 1 Nov 2024 15:30:00 +0800 Subject: [PATCH] fix osd activate error when node reboot From: @wangzengliang1 Reviewed-by: @yangxiaoliang Signed-off-by: @yangxiaoliang --- 0017-fix-osd-activate-error-when-node-reboot.patch | 13 +++++++++++++ ceph.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0017-fix-osd-activate-error-when-node-reboot.patch diff --git a/0017-fix-osd-activate-error-when-node-reboot.patch b/0017-fix-osd-activate-error-when-node-reboot.patch new file mode 100644 index 0000000..5e97b9c --- /dev/null +++ b/0017-fix-osd-activate-error-when-node-reboot.patch @@ -0,0 +1,13 @@ +diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py +index 44968fb8a..70fceeab6 100644 +--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py ++++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py +@@ -364,8 +364,6 @@ class Activate(object): + if len(self.argv) == 0: + print(sub_command_help) + return +- if not self.argv[0].isdigit() and self.argv[0]: +- self.argv.insert(0, "") + args = parser.parse_args(self.argv) + # Default to bluestore here since defaulting it in add_argument may + # cause both to be True diff --git a/ceph.spec b/ceph.spec index 4a02c6b..1c142e9 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 20 +Release: 21 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -159,6 +159,7 @@ Patch13: 0013-add-atomic-library-for-loongarch64.patch Patch14: 0014-fix-CVE-2022-3854.patch Patch15: 0015-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch Patch16: 0016-fix-CVE-2023-46159.patch +Patch17: 0017-fix-osd-activate-error-when-node-reboot.patch %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -2503,6 +2504,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Nov 01 2024 yangxiaoliang - 2:16.2.7-21 +- fix osd activate error when node reboot + * Fri Mar 22 2024 lizhipeng - 2:16.2.7-20 - fix CVE-2023-46159 -- Gitee