Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ceph for openSUSE:Factory checked in at 2022-04-08 00:26:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Fri Apr 8 00:26:42 2022 rev:79 rq:967145 version:16.2.7.654+gd5a90ff46f0 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2022-04-04 19:25:17.165298364 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new.1900/ceph-test.changes 2022-04-08 00:27:06.806729899 +0200 @@ -1,0 +2,6 @@ +Thu Mar 31 17:09:16 UTC 2022 - Stefen Allen <[email protected]> + +- Update to v16.2.7-654-gd5a90ff46f0 + + (bsc#1196733) remove build directory during %clean + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-16.2.7-652-gf5dc462fdb5.tar.bz2 New: ---- ceph-16.2.7-654-gd5a90ff46f0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.Cc6GGT/_old 2022-04-08 00:27:08.346712615 +0200 +++ /var/tmp/diff_new_pack.Cc6GGT/_new 2022-04-08 00:27:08.350712570 +0200 @@ -1,25 +1,24 @@ # -# spec file for package ceph +# spec file for package ceph-test # +# Copyright (c) 2022 SUSE LLC # Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file # at the top-level directory of this distribution and at # https://github.com/ceph/ceph/blob/master/COPYING # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -# upon. -# -# This file is under the GNU Lesser General Public License, version 2.1 -# -# Please submit bugfixes or comments via http://tracker.ceph.com/ -# +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. -################################################################################# -# conditional build section +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# please read http://rpm.org/user_doc/conditional_builds.html for explanation of -# bcond syntax! -################################################################################# + + %bcond_with make_check %bcond_with zbd %bcond_with cmake_verbose_logging @@ -125,7 +124,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 16.2.7.652+gf5dc462fdb5 +Version: 16.2.7.654+gd5a90ff46f0 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -136,12 +135,12 @@ %global _epoch_prefix %{?epoch:%{epoch}:} Summary: Ceph benchmarks and test tools -License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT +License: BSD-3-Clause AND BSL-1.0 AND CC-BY-SA-3.0 AND LGPL-2.1-only AND LGPL-3.0-only AND GPL-2.0-only AND MIT %if 0%{?suse_version} Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-16.2.7-652-gf5dc462fdb5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.7-654-gd5a90ff46f0.tar.bz2 %if 0%{?suse_version} Source94: ceph-rpmlintrc Source95: checkin.sh @@ -156,13 +155,10 @@ # dependencies that apply across all distro families ################################################################################# - - - Requires: ceph-common -Requires: xmlstarlet Requires: jq Requires: socat +Requires: xmlstarlet Requires(post): binutils %if 0%{with cephfs_java} BuildRequires: java-devel @@ -172,10 +168,10 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel %endif -BuildRequires: gperf BuildRequires: cmake > 3.5 BuildRequires: cryptsetup BuildRequires: fuse-devel +BuildRequires: gperf %if 0%{with seastar} BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3 %else @@ -193,21 +189,22 @@ BuildRequires: gperftools-devel >= 2.4 %endif %endif +BuildRequires: cryptsetup-devel +BuildRequires: fmt-devel >= 5.2.1 BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel BuildRequires: libblkid-devel >= 2.17 -BuildRequires: cryptsetup-devel -BuildRequires: libcurl-devel BuildRequires: libcap-ng-devel -BuildRequires: fmt-devel >= 5.2.1 -BuildRequires: pkgconfig(libudev) +BuildRequires: libcurl-devel +BuildRequires: libicu-devel BuildRequires: libnl3-devel BuildRequires: liboath-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: lua-devel BuildRequires: make +BuildRequires: nasm BuildRequires: ncurses-devel -BuildRequires: libicu-devel BuildRequires: parted BuildRequires: patch BuildRequires: perl @@ -218,15 +215,14 @@ BuildRequires: snappy-devel BuildRequires: sqlite-devel BuildRequires: sudo -BuildRequires: pkgconfig(udev) BuildRequires: util-linux BuildRequires: valgrind-devel BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet -BuildRequires: nasm -BuildRequires: lua-devel +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(udev) %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel %endif @@ -240,12 +236,12 @@ BuildRequires: jq BuildRequires: libuuid-devel BuildRequires: python%{python3_pkgversion}-bcrypt +BuildRequires: python%{python3_pkgversion}-coverage +BuildRequires: python%{python3_pkgversion}-dateutil BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-pecan -BuildRequires: python%{python3_pkgversion}-requests -BuildRequires: python%{python3_pkgversion}-dateutil -BuildRequires: python%{python3_pkgversion}-coverage BuildRequires: python%{python3_pkgversion}-pyOpenSSL +BuildRequires: python%{python3_pkgversion}-requests BuildRequires: socat %endif %if 0%{with zbd} @@ -278,61 +274,61 @@ BuildRequires: systemtap-sdt-devel BuildRequires: yaml-cpp-devel %if 0%{?fedora} -BuildRequires: libubsan BuildRequires: libasan BuildRequires: libatomic +BuildRequires: libubsan %endif %if 0%{?rhel} BuildRequires: gcc-toolset-9-annobin -BuildRequires: gcc-toolset-9-libubsan-devel BuildRequires: gcc-toolset-9-libasan-devel BuildRequires: gcc-toolset-9-libatomic-devel +BuildRequires: gcc-toolset-9-libubsan-devel %endif %endif ################################################################################# # distro-conditional dependencies ################################################################################# %if 0%{?suse_version} -BuildRequires: pkgconfig(systemd) BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(systemd) %{?systemd_requires} PreReq: %fillup_prereq BuildRequires: fdupes -BuildRequires: net-tools -BuildRequires: libbz2-devel -BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel +BuildRequires: libbz2-devel BuildRequires: libopenssl-devel +BuildRequires: mozilla-nss-devel +BuildRequires: net-tools BuildRequires: openldap2-devel #BuildRequires: krb5 #BuildRequires: krb5-devel BuildRequires: cunit-devel -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: liblz4-devel >= 1.7 BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{python3_pkgversion}-PrettyTable BuildRequires: python%{python3_pkgversion}-Sphinx +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: rdma-core-devel -BuildRequires: liblz4-devel >= 1.7 # for prometheus-alerts BuildRequires: golang-github-prometheus-prometheus %endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: boost-random -BuildRequires: nss-devel BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel +BuildRequires: nss-devel BuildRequires: openldap-devel #BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: CUnit-devel -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: lz4-devel >= 1.7 BuildRequires: python%{python3_pkgversion}-Cython +BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-prettytable +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-sphinx -BuildRequires: lz4-devel >= 1.7 %endif # distro-conditional make check dependencies %if 0%{with make_check} @@ -345,14 +341,14 @@ %ifarch x86_64 BuildRequires: xmlsec1-nss %endif -BuildRequires: xmlsec1-openssl -BuildRequires: xmlsec1-openssl-devel BuildRequires: python%{python3_pkgversion}-cherrypy BuildRequires: python%{python3_pkgversion}-jwt +BuildRequires: python%{python3_pkgversion}-pyOpenSSL BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug -BuildRequires: python%{python3_pkgversion}-pyOpenSSL +BuildRequires: xmlsec1-openssl +BuildRequires: xmlsec1-openssl-devel %endif %if 0%{?suse_version} BuildRequires: golang-github-prometheus-prometheus @@ -372,12 +368,12 @@ # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lttng-ust-devel BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-devel %endif %if 0%{?suse_version} -BuildRequires: lttng-ust-devel BuildRequires: babeltrace-devel +BuildRequires: lttng-ust-devel %endif %endif %if 0%{?suse_version} @@ -585,8 +581,9 @@ %endif %if 0%{?suse_version} %endif + %prep -%autosetup -p1 -n ceph-16.2.7-652-gf5dc462fdb5 +%autosetup -p1 -n ceph-16.2.7-654-gd5a90ff46f0 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -732,7 +729,6 @@ make "$CEPH_MFLAGS_JOBS" - %if 0%{with make_check} %check # run in-tree unittests @@ -740,7 +736,6 @@ ctest "$CEPH_MFLAGS_JOBS" %endif - %install pushd build make DESTDIR=%{buildroot} install @@ -1106,6 +1101,9 @@ %clean rm -rf %{buildroot} +# built binaries are no longer necessary at this point, +# but are consuming ~17GB of disk in the build environment +rm -rf build ################################################################################# # files and systemd scriptlets @@ -1263,4 +1261,5 @@ %endif %if 0%{?suse_version} %endif + %changelog ++++++ ceph.spec ++++++ ++++ 857 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ceph/ceph.spec ++++ and /work/SRC/openSUSE:Factory/.ceph.new.1900/ceph.spec ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.Cc6GGT/_old 2022-04-08 00:27:08.458711358 +0200 +++ /var/tmp/diff_new_pack.Cc6GGT/_new 2022-04-08 00:27:08.462711313 +0200 @@ -3,125 +3,53 @@ <sandbox>kvm</sandbox> - <overwrite> - <conditions> - <arch>x86_64</arch> - <package>ceph</package> - </conditions> - <hardware> - <disk> - <size unit="G">52</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> + <!-- - <overwrite> - <conditions> - <arch>aarch64</arch> - <package>ceph</package> - </conditions> - <hardware> - <disk> - <size unit="G">50</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> + 2022-03-31 - Tim Serong <[email protected]> - <overwrite> - <conditions> - <arch>ppc64le</arch> - <package>ceph</package> - </conditions> - <hardware> - <disk> - <size unit="G">50</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> + Builds of ceph 16.2.7 on IBS showed the following resource usage (in MB): - <overwrite> - <conditions> - <arch>s390x</arch> - <package>ceph</package> - </conditions> - <hardware> - <disk> - <size unit="G">42</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> + ceph aarch64 max disk: 41568 max mem: 13698 (on ibs-centriq-6:3 disk: 65536 mem: 18432) + ceph x86_64 max disk: 41621 max mem: 9852 (on sheep74:2 disk: 51200 mem: 12500) + ceph ppc64le max disk: 42005 max mem: 8754 (on ibs-power9-10:1 disk: 61440 mem: 20480) + ceph s390x max disk: 40698 max mem: 8875 (on s390zl36:1 disk: 51200 mem: 10240) + ceph-test x86_64 max disk: 51760 max mem: 16835 (on sheep94:2 disk: 112640 mem: 16384) + + Based on the above (and to hopefully provide a little wiggle room for + the future while at the same time not being too demanding of workers) + I've set the disk constraints to 50GB for ceph and 60GB for ceph-test. + Memory requirements remain at 8GB and 10GB respectively as they were + previously - despite the memory usage shown above, AFAIK we haven't + run out of memory during builds, and this keeps the pool of possible + workers noticeably larger than it would be if we required 16GB. + + Note to future hackers: please add comments here to describe any further + changes made. Thank you! + + --> + + <hardware> + <disk> + <size unit="G">50</size> + </disk> + <physicalmemory> + <size unit="G">8</size> + </physicalmemory> + </hardware> <overwrite> <conditions> - <arch>x86_64</arch> <package>ceph-test</package> </conditions> <hardware> <disk> - <size unit="G">64</size> + <size unit="G">60</size> </disk> <physicalmemory> <size unit="G">10</size> </physicalmemory> </hardware> </overwrite> - - <overwrite> - <conditions> - <arch>aarch64</arch> - <package>ceph-test</package> - </conditions> - <hardware> - <disk> - <size unit="G">42</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> - - <overwrite> - <conditions> - <arch>ppc64le</arch> - <package>ceph-test</package> - </conditions> - <hardware> - <disk> - <size unit="G">28</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> - - <overwrite> - <conditions> - <arch>s390x</arch> - <package>ceph-test</package> - </conditions> - <hardware> - <disk> - <size unit="G">42</size> - </disk> - <physicalmemory> - <size unit="G">8</size> - </physicalmemory> - </hardware> - </overwrite> </constraints> ++++++ ceph-16.2.7-652-gf5dc462fdb5.tar.bz2 -> ceph-16.2.7-654-gd5a90ff46f0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ceph/ceph-16.2.7-652-gf5dc462fdb5.tar.bz2 /work/SRC/openSUSE:Factory/.ceph.new.1900/ceph-16.2.7-654-gd5a90ff46f0.tar.bz2 differ: char 11, line 1
