fix osd activate error when node reboot
From: @wangzengliang1 Reviewed-by: @yangxiaoliang Signed-off-by: @yangxiaoliang
This commit is contained in:
parent
b9defa181b
commit
02c8dde923
13
0017-fix-osd-activate-error-when-node-reboot.patch
Normal file
13
0017-fix-osd-activate-error-when-node-reboot.patch
Normal file
@ -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
|
||||
@ -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 <yangxiaoliang@uniontech.com> - 2:16.2.7-21
|
||||
- fix osd activate error when node reboot
|
||||
|
||||
* Fri Mar 22 2024 lizhipeng <qiuxinyidian@gmail.com> - 2:16.2.7-20
|
||||
- fix CVE-2023-46159
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user