packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!102 修复ceph安装时出现错误log的问题

Browse Source 
From: @wangzengliang1 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2022-03-16 07:38:11 +00:00 committed by Gitee
commit 646e8d7dba
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ceph.spec
View File

@ -125,7 +125,7 @@
#################################################################################
Name: ceph
Version: 16.2.7
Release: 1
Release: 2
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2
%endif
@ -1240,7 +1240,7 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
%endif
# Parallel build settings ...
CEPH_MFLAGS_JOBS="-j32"
CEPH_MFLAGS_JOBS="-j20"
CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
%if 0%{?__isa_bits} == 32
# 32-bit builds can use 3G memory max, which is not enough even for -j2
@ -1662,7 +1662,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mds@\*.service ceph-mds.target
%systemd_post ceph-mds@\x2a.service ceph-mds.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || :
@ -1673,11 +1673,11 @@ fi
%service_del_preun ceph-mds@\*.service ceph-mds.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mds@\*.service ceph-mds.target
%systemd_preun ceph-mds@\x2a.service ceph-mds.target
%endif
%postun mds
%systemd_postun ceph-mds@\*.service ceph-mds.target
%systemd_postun ceph-mds@\x2a.service ceph-mds.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -1686,7 +1686,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mds@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-mds@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -1706,7 +1706,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mgr@\*.service ceph-mgr.target
%systemd_post ceph-mgr@\x2a.service ceph-mgr.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mgr.target >/dev/null 2>&1 || :
@ -1717,11 +1717,11 @@ fi
%service_del_preun ceph-mgr@\*.service ceph-mgr.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mgr@\*.service ceph-mgr.target
%systemd_preun ceph-mgr@\x2a.service ceph-mgr.target
%endif
%postun mgr
%systemd_postun ceph-mgr@\*.service ceph-mgr.target
%systemd_postun ceph-mgr@\x2a.service ceph-mgr.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -1730,7 +1730,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-mgr@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -1845,7 +1845,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mon@\*.service ceph-mon.target
%systemd_post ceph-mon@\x2a.service ceph-mon.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || :
@ -1856,11 +1856,11 @@ fi
%service_del_preun ceph-mon@\*.service ceph-mon.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mon@\*.service ceph-mon.target
%systemd_preun ceph-mon@\x2a.service ceph-mon.target
%endif
%postun mon
%systemd_postun ceph-mon@\*.service ceph-mon.target
%systemd_postun ceph-mon@\x2a.service ceph-mon.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -1869,7 +1869,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-mon@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -1894,7 +1894,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post cephfs-mirror@\*.service cephfs-mirror.target
%systemd_post cephfs-mirror@\x2a.service cephfs-mirror.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start cephfs-mirror.target >/dev/null 2>&1 || :
@ -1905,11 +1905,11 @@ fi
%service_del_preun cephfs-mirror@\*.service cephfs-mirror.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun cephfs-mirror@\*.service cephfs-mirror.target
%systemd_preun cephfs-mirror@\x2a.service cephfs-mirror.target
%endif
%postun -n cephfs-mirror
%systemd_postun cephfs-mirror@\*.service cephfs-mirror.target
%systemd_postun cephfs-mirror@\x2a.service cephfs-mirror.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -1918,7 +1918,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart cephfs-mirror@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart cephfs-mirror@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -1939,7 +1939,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
%systemd_post ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || :
@ -1950,11 +1950,11 @@ fi
%service_del_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
%systemd_preun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
%endif
%postun -n rbd-mirror
%systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
%systemd_postun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -1963,7 +1963,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-rbd-mirror@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-rbd-mirror@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -1980,7 +1980,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target
%systemd_post ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-immutable-object-cache.target >/dev/null 2>&1 || :
@ -1991,11 +1991,11 @@ fi
%service_del_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target
%systemd_preun ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
%endif
%postun immutable-object-cache
%systemd_postun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target
%systemd_postun ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -2004,7 +2004,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-immutable-object-cache@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-immutable-object-cache@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -2037,7 +2037,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-radosgw@\*.service ceph-radosgw.target
%systemd_post ceph-radosgw@\x2a.service ceph-radosgw.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || :
@ -2048,12 +2048,12 @@ fi
%service_del_preun ceph-radosgw@\*.service ceph-radosgw.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-radosgw@\*.service ceph-radosgw.target
%systemd_preun ceph-radosgw@\x2a.service ceph-radosgw.target
%endif
%postun radosgw
/sbin/ldconfig
%systemd_postun ceph-radosgw@\*.service ceph-radosgw.target
%systemd_postun ceph-radosgw@\x2a.service ceph-radosgw.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -2062,7 +2062,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-radosgw@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-radosgw@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -2094,7 +2094,7 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
%systemd_post ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
%endif
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
@ -2110,11 +2110,11 @@ fi
%service_del_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
%systemd_preun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
%endif
%postun osd
%systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
%systemd_postun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them.
@ -2123,7 +2123,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH
fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-osd@\*.service ceph-volume@\*.service > /dev/null 2>&1 || :
/usr/bin/systemctl try-restart ceph-osd@\x2a.service ceph-volume@\x2a.service > /dev/null 2>&1 || :
fi
fi
@ -2484,7 +2484,10 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
* Fri 14 Jan 2022 luo rixin <luorixin@huawei.com> - 1:16.2.7-1
* Fri Mar 11 2022 wangzengliang <wangzengliang1@huawei.com> - 1:16.2.7-2
- fix * recognition error when install
* Fri Jan 14 2022 luo rixin <luorixin@huawei.com> - 1:16.2.7-1
- isa-l: update isa-l to fix aarch64 text relocation error
* Thu Dec 30 2021 liuqinfei <18138800392@163.com> - 1:16.2.7-0