Accepting request 1110254 from filesystems:ceph:pacific
- Update to 16.2.14-66-g7aa6ce9419f:
+ (bsc#1207765) rgw/rados: check_quota() uses real bucket owner
+ (bsc#1212559) pacific: os/bluestore: cumulative bluefs backport
This notably includes:
* os/bluestore: BlueFS fine grain locking
* os/bluestore/bluefs: Fix improper vselector tracking in _flush_special()
* os/bluestore: enable 4K allocation unit for BlueFS
* os/bluestore/bluefs: Fix sync compactionA
+ (bsc#1213217) ceph.spec.in: Require fmt-devel < 10
+ ceph.spec.in: enable build on riscv64 for openSUSE Factory
+ ceph.spec.in: Require Cython >= 0.29 but < 3
+ cephadm: update to the latest container images:
* registry.suse.com/ses/7.1/ceph/prometheus-server:2.37.6
* registry.suse.com/ses/7.1/ceph/prometheus-node-exporter:1.5.0
* registry.suse.com/ses/7.1/ceph/grafana:8.5.22
* registry.suse.com/ses/7.1/ceph/haproxy:2.0.31
- Drop ceph-test.changes (no longer necessary since using _multibuild)
OBS-URL: https://build.opensuse.org/request/show/1110254
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=352
This commit is contained in:
Michael Fritch
Git OBS Bridge
parent
d3167c3496
commit
7b72fb8725
@ -11,8 +11,7 @@ FAQ
|
|||||||
|
|
||||||
Q. What is the pre_checkin.sh script?
|
Q. What is the pre_checkin.sh script?
|
||||||
|
|
||||||
A. The "pre_checkin.sh" script generates ceph-test.spec from ceph.spec, and
|
A. The "pre_checkin.sh" script generates ceph-test.spec from ceph.spec.
|
||||||
ceph-test.changes from ceph.changes.
|
|
||||||
|
|
||||||
Q. Should I run it before running checkin.sh?
|
Q. Should I run it before running checkin.sh?
|
||||||
|
|
||||||
|
|||||||
@ -10,11 +10,14 @@ Instructions for submitting
|
|||||||
|
|
||||||
The ceph.spec file is maintained upstream at https://github.com/ceph/ceph
|
The ceph.spec file is maintained upstream at https://github.com/ceph/ceph
|
||||||
|
|
||||||
To patch it, use the following procedure:
|
The Ceph package in OBS is built from SUSE's downstream fork at
|
||||||
|
https://github.com/SUSE/ceph (specifically, the ses7p branch).
|
||||||
|
|
||||||
|
To patch ceph.spec, ideally you should use the following procedure:
|
||||||
|
|
||||||
1. find out the current Factory ceph maintainer(s) (e.g. by examining the
|
1. find out the current Factory ceph maintainer(s) (e.g. by examining the
|
||||||
most recent entries in the ceph.changes file)
|
most recent entries in the ceph.changes file)
|
||||||
2. open PR targeting the master branch at https://github.com/ceph/ceph
|
2. open PR targeting the main branch at https://github.com/ceph/ceph
|
||||||
Make sure to sign your commit ("git commit --signoff") using your real name
|
Make sure to sign your commit ("git commit --signoff") using your real name
|
||||||
and real email address. If this is a problem, contact the current Factory
|
and real email address. If this is a problem, contact the current Factory
|
||||||
maintainers: they can act as a proxy.
|
maintainers: they can act as a proxy.
|
||||||
@ -24,6 +27,11 @@ The Factory ceph maintainers will take care of getting your upstream PR
|
|||||||
reviewed, tested, merged and, if necessary, backported. They will also take care
|
reviewed, tested, merged and, if necessary, backported. They will also take care
|
||||||
of submitting the patch to Factory.
|
of submitting the patch to Factory.
|
||||||
|
|
||||||
|
Alternately, for patches that make no sense to submit to upstream main,
|
||||||
|
you can open a PR against the ses7p branch of https://github.com/SUSE/ceph
|
||||||
|
then ping the Factory ceph maintainers to get that reviewed and submitted to
|
||||||
|
Factory.
|
||||||
|
|
||||||
Caveat for testing
|
Caveat for testing
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|||||||
BIN
ceph-16.2.13-66-g54799ee0666.tar.bz2
(Stored with Git LFS)
BIN
ceph-16.2.13-66-g54799ee0666.tar.bz2
(Stored with Git LFS)
Binary file not shown.
BIN
ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
(Stored with Git LFS)
Normal file
BIN
ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
2888
ceph-test.changes
2888
ceph-test.changes
File diff suppressed because it is too large
Load Diff
@ -138,7 +138,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph-test
|
Name: ceph-test
|
||||||
Version: 16.2.13.66+g54799ee0666
|
Version: 16.2.14.66+g7aa6ce9419f
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -154,7 +154,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
|
|||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
URL: http://ceph.com/
|
||||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.13-66-g54799ee0666.tar.bz2
|
Source0: %{?_remote_tarball_prefix}ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Source92: ceph-rpmlintrc
|
Source92: ceph-rpmlintrc
|
||||||
Source93: checkin.sh
|
Source93: checkin.sh
|
||||||
@ -214,7 +214,7 @@ BuildRequires: libblkid-devel >= 2.17
|
|||||||
BuildRequires: cryptsetup-devel
|
BuildRequires: cryptsetup-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: libcap-ng-devel
|
BuildRequires: libcap-ng-devel
|
||||||
BuildRequires: fmt-devel >= 5.2.1
|
BuildRequires: ((fmt-devel >= 5.2.1 with fmt-devel < 10) or fmt-9-devel)
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
BuildRequires: libnl3-devel
|
BuildRequires: libnl3-devel
|
||||||
BuildRequires: liboath-devel
|
BuildRequires: liboath-devel
|
||||||
@ -321,7 +321,7 @@ BuildRequires: openldap2-devel
|
|||||||
#BuildRequires: krb5-devel
|
#BuildRequires: krb5-devel
|
||||||
BuildRequires: cunit-devel
|
BuildRequires: cunit-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
|
BuildRequires: (python%{python3_pkgversion}-Cython >= 0.29 with python%{python3_pkgversion}-Cython < 3)
|
||||||
BuildRequires: python%{python3_pkgversion}-PrettyTable
|
BuildRequires: python%{python3_pkgversion}-PrettyTable
|
||||||
BuildRequires: python%{python3_pkgversion}-Sphinx
|
BuildRequires: python%{python3_pkgversion}-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
@ -343,7 +343,7 @@ BuildRequires: openssl-devel
|
|||||||
BuildRequires: CUnit-devel
|
BuildRequires: CUnit-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
|
BuildRequires: python%{python3_pkgversion}-Cython
|
||||||
BuildRequires: python%{python3_pkgversion}-prettytable
|
BuildRequires: python%{python3_pkgversion}-prettytable
|
||||||
BuildRequires: python%{python3_pkgversion}-sphinx
|
BuildRequires: python%{python3_pkgversion}-sphinx
|
||||||
BuildRequires: lz4-devel >= 1.7
|
BuildRequires: lz4-devel >= 1.7
|
||||||
@ -599,7 +599,7 @@ This package contains Ceph benchmarks and test tools.
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-16.2.13-66-g54799ee0666
|
%autosetup -p1 -n ceph-16.2.14-66-g7aa6ce9419f
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Disable lto on systems that do not support symver attribute
|
# Disable lto on systems that do not support symver attribute
|
||||||
|
|||||||
21
ceph.changes
21
ceph.changes
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 11 09:06:12 UTC 2023 - Tim Serong <tserong@suse.com>
|
||||||
|
|
||||||
|
- Update to 16.2.14-66-g7aa6ce9419f:
|
||||||
|
+ (bsc#1207765) rgw/rados: check_quota() uses real bucket owner
|
||||||
|
+ (bsc#1212559) pacific: os/bluestore: cumulative bluefs backport
|
||||||
|
This notably includes:
|
||||||
|
* os/bluestore: BlueFS fine grain locking
|
||||||
|
* os/bluestore/bluefs: Fix improper vselector tracking in _flush_special()
|
||||||
|
* os/bluestore: enable 4K allocation unit for BlueFS
|
||||||
|
* os/bluestore/bluefs: Fix sync compactionA
|
||||||
|
+ (bsc#1213217) ceph.spec.in: Require fmt-devel < 10
|
||||||
|
+ ceph.spec.in: enable build on riscv64 for openSUSE Factory
|
||||||
|
+ ceph.spec.in: Require Cython >= 0.29 but < 3
|
||||||
|
+ cephadm: update to the latest container images:
|
||||||
|
* registry.suse.com/ses/7.1/ceph/prometheus-server:2.37.6
|
||||||
|
* registry.suse.com/ses/7.1/ceph/prometheus-node-exporter:1.5.0
|
||||||
|
* registry.suse.com/ses/7.1/ceph/grafana:8.5.22
|
||||||
|
* registry.suse.com/ses/7.1/ceph/haproxy:2.0.31
|
||||||
|
- Drop ceph-test.changes (no longer necessary since using _multibuild)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 16 15:25:39 UTC 2023 - Ana Guerrero <ana.guerrero@suse.com>
|
Wed Aug 16 15:25:39 UTC 2023 - Ana Guerrero <ana.guerrero@suse.com>
|
||||||
|
|
||||||
|
|||||||
14
ceph.spec
14
ceph.spec
@ -138,7 +138,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 16.2.13.66+g54799ee0666
|
Version: 16.2.14.66+g7aa6ce9419f
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -154,10 +154,10 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
|
|||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
URL: http://ceph.com/
|
||||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.13-66-g54799ee0666.tar.bz2
|
Source0: %{?_remote_tarball_prefix}ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# _insert_obs_source_lines_here
|
# _insert_obs_source_lines_here
|
||||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
ExclusiveArch: x86_64 aarch64 ppc64le s390x riscv64
|
||||||
%endif
|
%endif
|
||||||
#################################################################################
|
#################################################################################
|
||||||
# dependencies that apply across all distro families
|
# dependencies that apply across all distro families
|
||||||
@ -202,7 +202,7 @@ BuildRequires: libblkid-devel >= 2.17
|
|||||||
BuildRequires: cryptsetup-devel
|
BuildRequires: cryptsetup-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: libcap-ng-devel
|
BuildRequires: libcap-ng-devel
|
||||||
BuildRequires: fmt-devel >= 5.2.1
|
BuildRequires: ((fmt-devel >= 5.2.1 with fmt-devel < 10) or fmt-9-devel)
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
BuildRequires: libnl3-devel
|
BuildRequires: libnl3-devel
|
||||||
BuildRequires: liboath-devel
|
BuildRequires: liboath-devel
|
||||||
@ -309,7 +309,7 @@ BuildRequires: openldap2-devel
|
|||||||
#BuildRequires: krb5-devel
|
#BuildRequires: krb5-devel
|
||||||
BuildRequires: cunit-devel
|
BuildRequires: cunit-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
|
BuildRequires: (python%{python3_pkgversion}-Cython >= 0.29 with python%{python3_pkgversion}-Cython < 3)
|
||||||
BuildRequires: python%{python3_pkgversion}-PrettyTable
|
BuildRequires: python%{python3_pkgversion}-PrettyTable
|
||||||
BuildRequires: python%{python3_pkgversion}-Sphinx
|
BuildRequires: python%{python3_pkgversion}-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
@ -331,7 +331,7 @@ BuildRequires: openssl-devel
|
|||||||
BuildRequires: CUnit-devel
|
BuildRequires: CUnit-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
|
BuildRequires: python%{python3_pkgversion}-Cython
|
||||||
BuildRequires: python%{python3_pkgversion}-prettytable
|
BuildRequires: python%{python3_pkgversion}-prettytable
|
||||||
BuildRequires: python%{python3_pkgversion}-sphinx
|
BuildRequires: python%{python3_pkgversion}-sphinx
|
||||||
BuildRequires: lz4-devel >= 1.7
|
BuildRequires: lz4-devel >= 1.7
|
||||||
@ -1212,7 +1212,7 @@ This package provides Ceph default alerts for Prometheus.
|
|||||||
# common
|
# common
|
||||||
#################################################################################
|
#################################################################################
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-16.2.13-66-g54799ee0666
|
%autosetup -p1 -n ceph-16.2.14-66-g7aa6ce9419f
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Disable lto on systems that do not support symver attribute
|
# Disable lto on systems that do not support symver attribute
|
||||||
|
|||||||
@ -130,7 +130,7 @@ fi
|
|||||||
echo "Running \"osc add *bz2\" to register the new tarball"
|
echo "Running \"osc add *bz2\" to register the new tarball"
|
||||||
osc add *bz2
|
osc add *bz2
|
||||||
|
|
||||||
echo "Running pre_checkin.sh (if you touch the ceph.changes file after running this script, re-run pre_checkin.sh manually)"
|
echo "Running pre_checkin.sh"
|
||||||
if [ -f "pre_checkin.sh" ] ; then
|
if [ -f "pre_checkin.sh" ] ; then
|
||||||
bash pre_checkin.sh
|
bash pre_checkin.sh
|
||||||
else
|
else
|
||||||
|
|||||||
@ -265,12 +265,6 @@ function insert_line_before {
|
|||||||
sed -i "/${match_regex}/i $line_to_insert" $FILE
|
sed -i "/${match_regex}/i $line_to_insert" $FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function copy_changes_file {
|
|
||||||
local dest_pkg=$1
|
|
||||||
|
|
||||||
cp ceph.changes ${dest_pkg}.changes
|
|
||||||
}
|
|
||||||
|
|
||||||
function set_build_constraints {
|
function set_build_constraints {
|
||||||
local FILE=$1
|
local FILE=$1
|
||||||
shift
|
shift
|
||||||
@ -312,6 +306,5 @@ insert_line_before "$PACKAGE.spec" "Source95: pre_checkin.env" "^Source96:"
|
|||||||
insert_line_before "$PACKAGE.spec" "Source94: pre_checkin.sh" "^Source95:"
|
insert_line_before "$PACKAGE.spec" "Source94: pre_checkin.sh" "^Source95:"
|
||||||
insert_line_before "$PACKAGE.spec" "Source93: checkin.sh" "^Source94:"
|
insert_line_before "$PACKAGE.spec" "Source93: checkin.sh" "^Source94:"
|
||||||
insert_line_before "$PACKAGE.spec" "Source92: ceph-rpmlintrc" "^Source93:"
|
insert_line_before "$PACKAGE.spec" "Source92: ceph-rpmlintrc" "^Source93:"
|
||||||
copy_changes_file $PACKAGE
|
|
||||||
set_build_constraints $SPEC_FILE "hardware:disk:size unit=G ${CEPH_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_BUILD_MEMORY_SIZE_GB}"
|
set_build_constraints $SPEC_FILE "hardware:disk:size unit=G ${CEPH_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_BUILD_MEMORY_SIZE_GB}"
|
||||||
set_build_constraints "$PACKAGE.spec" "hardware:disk:size unit=G ${CEPH_TEST_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_TEST_BUILD_MEMORY_SIZE_GB}"
|
set_build_constraints "$PACKAGE.spec" "hardware:disk:size unit=G ${CEPH_TEST_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_TEST_BUILD_MEMORY_SIZE_GB}"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user