From 834aaee994c932934a847d650d4992c121f53209 Mon Sep 17 00:00:00 2001 From: yangxiaoliang <154920043@qq.com> Date: Fri, 1 Nov 2024 15:59:46 +0800 Subject: [PATCH] fix osd activate error when node reboot From: @wangzengliang1 Reviewed-by: @yangxiaoliang Signed-off-by: @yangxiaoliang --- 0023-fix-osd-activate-error-when-node-reboot.patch | 13 +++++++++++++ ceph.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0023-fix-osd-activate-error-when-node-reboot.patch diff --git a/0023-fix-osd-activate-error-when-node-reboot.patch b/0023-fix-osd-activate-error-when-node-reboot.patch new file mode 100644 index 0000000..5e97b9c --- /dev/null +++ b/0023-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 1fac244..3fcff39 100644 --- a/ceph.spec +++ b/ceph.spec @@ -129,7 +129,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 23 +Release: 24 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -169,6 +169,7 @@ Patch19: 0019-include-memory.patch Patch20: 0020-compiled-with-gcc12.patch Patch21: 0021-boost-enable-sw64-architecture.patch Patch22: 0022-add-atomic-library-for-riscv64.patch +Patch23: 0023-fix-osd-activate-error-when-node-reboot.patch %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -2534,6 +2535,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Nov 01 2024 yangxiaoliang - 2:16.2.7-24 +- fix osd activate error when node reboot + * Wed Aug 23 2023 laokz - 2:16.2.7-23 - fix riscv64 16-byte atomic build error -- Gitee