Commit 6ba03998 authored by Duncan Bellamy's avatar Duncan Bellamy Committed by Leo
Browse files

community/ceph: upgrade to 16.2.5

parent 6a261ac7
......@@ -4,9 +4,9 @@ diff -Nurp a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/das
--- a/src/pybind/mgr/dashboard/frontend/package.json 2021-04-03 08:58:07.611941559 +0100
+++ b/src/pybind/mgr/dashboard/frontend/package.json 2021-04-03 08:59:13.903122038 +0100
@@ -119,8 +119,6 @@
"@types/node": "12.12.62",
"@types/simplebar": "5.1.1",
"codelyzer": "6.0.1",
"css-loader": "3.6.0",
- "cypress": "5.3.0",
- "cypress-multi-reporters": "1.4.0",
"html-linter": "1.1.1",
......
commit a7e3ece459111d157a20d05de3a92cf4dab6bde6
Author: Kefu Chai <kchai@redhat.com>
Date: Thu Jul 1 15:24:50 2021 +0800
cmake: set CMAKE_BUILD_TYPE only if .git exists
distros intend to fine tune the CFLAGS and CXXFLAGS by themselves, see
- https://git.alpinelinux.org/abuild/tree/abuild.conf
- https://wiki.archlinux.org/title/CMake_package_guidelines#CMake_undesired_behaviors
- https://github.com/Debian/debhelper/blob/5d1bb29841043d8e47ebbdd043e6cd086cad508e/lib/Debian/Debhelper/Buildsystem/cmake.pm#L16
so instead of setting a CMAKE_BUILD_TYPE when building from a
dist tarball, let's just leave it empty.
Signed-off-by: Kefu Chai <kchai@redhat.com>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 760a2ceb0c..6f35e87f90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,12 +156,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
endif()
endif(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-if(NOT CMAKE_BUILD_TYPE)
- if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
- set(default_build_type "Debug")
- else()
- set(default_build_type "RelWithDebInfo")
- endif()
+if(DEFINED CMAKE_BUILD_TYPE OR EXISTS "${CMAKE_SOURCE_DIR}/.git")
+ set(default_build_type "Debug")
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
STRING "Default BUILD_TYPE is Debug, other options are: RelWithDebInfo, Release, and MinSizeRel." FORCE)
endif()
submitted as:
https://github.com/ceph/ceph/pull/41470
diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
index 257daa9c1..90e64f98a 100644
--- a/src/rgw/rgw_string.h
+++ b/src/rgw/rgw_string.h
@@ -8,6 +8,8 @@
#include <stdlib.h>
#include <limits.h>
#include <string_view>
+#include <string>
+#include <stdexcept>
#include <boost/container/small_vector.hpp>
commit ff79cae5a1243111c8a039426081638d40a258fa
Author: Kefu Chai <kchai@redhat.com>
Date: Mon Apr 12 17:28:56 2021 +0800
common/Formatter: include used header
otherwise it fails to build with gcc-toolset-10, like:
../src/common/Formatter.cc: In member function ‘virtual void ceph::XMLFormatter::close_section()’:
../src/common/Formatter.cc:449:8: error: ‘transform’ is not a member of ‘std’
449 | std::transform(section.begin(), section.end(), section.begin(),
| ^~~~~~~~~
Signed-off-by: Kefu Chai <kchai@redhat.com>
diff --git a/src/common/Formatter.cc b/src/common/Formatter.cc
index b599e48b34..362deffb5a 100644
--- a/src/common/Formatter.cc
+++ b/src/common/Formatter.cc
@@ -19,6 +19,7 @@
#include "include/buffer.h"
#include <fmt/format.h>
+#include <algorithm>
#include <set>
#include <limits>
From 7c2f58ea5ec70e5606ab362e6f4cfda087cec65a Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Apr 2021 17:32:59 +0800
Subject: [PATCH] mon,osd: always init local variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
this change silences the warning like:
../src/mon/Monitor.cc: In member function ‘void Monitor::handle_command(MonOpRequestRef)’:
../src/mon/Monitor.cc:3703:55: warning: ‘osd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
3703 | uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
src/mon/Monitor.cc | 2 +-
src/osd/osd_types.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 6126db9caa609..ffac8be278c16 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3698,7 +3698,7 @@ void Monitor::handle_command(MonOpRequestRef op)
rs = ss2.str();
r = 0;
} else if (prefix == "osd last-stat-seq") {
- int64_t osd;
+ int64_t osd = 0;
cmd_getval(cmdmap, "id", osd);
uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd);
if (f) {
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index c0fe8f781c21e..fe2fe7defa9a8 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1631,12 +1631,12 @@ struct pg_pool_t {
}
int64_t get_dedup_tier() const {
- int64_t tier_id;
+ int64_t tier_id = 0;
opts.get(pool_opts_t::DEDUP_TIER, &tier_id);
return tier_id;
}
int64_t get_dedup_cdc_chunk_size() const {
- int64_t chunk_size;
+ int64_t chunk_size = 0;
opts.get(pool_opts_t::DEDUP_CDC_CHUNK_SIZE, &chunk_size);
return chunk_size;
}
From 03770f75562812c683ff1503d2032dcd66d83289 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Apr 2021 17:43:13 +0800
Subject: [PATCH] include/denc: include used header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
to address the FTBFS like:
/home/kchai/ceph/src/include/denc.h: In member function ‘void DencDumper<T>::dump() const’:
/home/kchai/ceph/src/include/denc.h:121:60: error: ‘O_BINARY’ was not declared in this scope
int fd = ::open(fn, O_WRONLY|O_TRUNC|O_CREAT|O_CLOEXEC|O_BINARY, 0644);
^~~~~~~~
/home/kchai/ceph/src/include/denc.h:121:60: note: the macro ‘O_BINARY’ had not yet been defined
In file included from /home/kchai/ceph/src/include/statlite.h:14,
from /home/kchai/ceph/src/include/types.h:41,
from /home/kchai/ceph/src/auth/Crypto.h:19,
from /home/kchai/ceph/src/auth/Crypto.cc:21:
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
src/include/denc.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/include/denc.h b/src/include/denc.h
index 266121bd20cda..10fa8d0c87124 100644
--- a/src/include/denc.h
+++ b/src/include/denc.h
@@ -39,6 +39,7 @@
#include <boost/intrusive/set.hpp>
#include <boost/optional.hpp>
+#include "include/compat.h"
#include "include/intarith.h"
#include "include/int_types.h"
#include "include/scope_guard.h"
......@@ -3,13 +3,14 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=ceph
pkgver=16.2.4
pkgrel=1
pkgver=16.2.5
pkgrel=0
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
url="https://ceph.com/"
arch="all !mips !mips64"
# riscv64 missing nodejs
arch="all !mips !mips64 !riscv64"
# https://github.com/ceph/ceph/blob/master/COPYING
license="LGPL-2.1-only AND LGPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND CC-BY-SA-1.0 AND BSL-1.0 AND GPL-2.0-or-later WITH Autoconf-exception-2.0 AND BSD-3-Clause AND MIT AND custom"
depends="ceph-osd ceph-mds ceph-mon"
......@@ -119,10 +120,12 @@ source="https://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
37-fix_tests.patch
42-no-virtualenvs.patch
43-aarch64-erasure.patch
44-cmake-buildtype.patch
44-LogClock.h.patch
44-staticcast.patch
44-node_modules.patch
missing-include.patch
44-missing-include.patch
44-missing-include2.patch
"
subpackages="
......@@ -196,6 +199,9 @@ prepare() {
patch -p1 -i "$srcdir"/30-ubuntu-32bit-fixes.patch.noauto
patch -p1 -i "$srcdir"/31-32bit_fix_tests.patch.noauto ;;
esac
#delete bundled boost as >300mb and using system boost
rm -rf src/boost
}
build() {
......@@ -204,7 +210,11 @@ build() {
# builders keep failing when -jN == nproc
export MAKEFLAGS="$MAKEFLAGS -j$((JOBS<16 ? JOBS : 16))"
# use alternate registry as original can timeout for arm32bit
export NPM_REGISTRY=https://registry.npmjs.org
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DLUA_LIBRARIES=/usr/lib/lua"$_lua"/liblua.so \
-DALLOCATOR=libc \
-DCMAKE_INSTALL_PREFIX=/usr \
......@@ -216,10 +226,7 @@ build() {
-DWITH_MANPAGE=ON \
-DWITH_SYSTEM_BOOST=ON \
-DWITH_SYSTEM_NPM=ON \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-DWITH_PYTHON2=OFF \
-DWITH_PYTHON3=3 \
-DMGR_PYTHON_VERSION=3 \
-DWITH_LTTNG=OFF \
-DWITH_RDMA=OFF \
-DWITH_SYSTEMD=OFF \
......@@ -232,25 +239,29 @@ build() {
}
package() {
# free up some space before install
rm -rf build/src/pybind/mgr/dashboard/cypress
rm -rf src/pybind/mgr/dashboard/frontend/node_modules
make -C build DESTDIR="$pkgdir" install
# remove the upstream init file and put in openrc ones
rm -f "$pkgdir"/etc/init.d/ceph
install -D -m 0744 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/ceph
install -D -m 0744 "$srcdir"/"$pkgname".confd "$pkgdir"/etc/conf.d/ceph
install -D -m 755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/ceph
install -D -m 644 "$srcdir"/"$pkgname".confd "$pkgdir"/etc/conf.d/ceph
# move mount.* binaries to /sbin
mkdir -p "$pkgdir"/sbin
mv "$pkgdir"/usr/sbin/mount.* "$pkgdir"/sbin
install -m 0644 -D src/etc-rbdmap "$pkgdir"/etc/ceph/rbdmap
install -m 0644 -D src/logrotate.conf "$pkgdir"/etc/logrotate.d/ceph
install -m 0644 -D etc/sysctl/90-ceph-osd.conf "$pkgdir"/etc/sysctl.d/90-ceph-osd.conf
install -m 644 -D src/etc-rbdmap "$pkgdir"/etc/ceph/rbdmap
install -m 644 -D src/logrotate.conf "$pkgdir"/etc/logrotate.d/ceph
install -m 644 -D etc/sysctl/90-ceph-osd.conf "$pkgdir"/etc/sysctl.d/90-ceph-osd.conf
# udev rules
install -m 0644 -D udev/50-rbd.rules "$pkgdir"/etc/udev/rules.d/50-rbd.rules
install -m 644 -D udev/50-rbd.rules "$pkgdir"/etc/udev/rules.d/50-rbd.rules
# sudoers.d
install -m 0600 -D sudoers.d/ceph-osd-smartctl "$pkgdir"/etc/sudoers.d/ceph-osd-smartctl
install -m 600 -D sudoers.d/ceph-osd-smartctl "$pkgdir"/etc/sudoers.d/ceph-osd-smartctl
# delete systemd related stuff
rm "$pkgdir"/usr/sbin/ceph-volume-systemd
......@@ -524,13 +535,13 @@ mgr() {
}
sha512sums="
8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6 ceph_16.2.4.orig.tar.gz
5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a ceph_16.2.5.orig.tar.gz
110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121 ceph.confd
ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3 ceph.initd
94687578411bf0de1b17555ed81c188c88ea63ac4a25993bd8fde9cf68afbbfbdec7b2d7c54fdcfbd4aed4eb78754e8061c308955596cbe037ff15b575874cc6 10-musl-fixes.patch
03ef3598181c45ecba5600a1e4db7fd897ea9d3c8abdfaad2dcf84c7a241d9ba18e7f7885d69ee0572ee307fc94600a2784a07da909d37a51de27f8ded2e3a70 20-pci.patch
b879993a285a771c3640c5214ff70e8e01673c0c5e23a0f88ac70db168aeb1dd2eaed12805ed5076adae5a0f596abcb9d82220c6fd97643169cb92788898a189 30-32bit_fix.patch.noauto
013ff1e35fd91b4b4a9d712701e78975f423a883650b391d9fe73dbc2ab68f02ecd1fa51e1ba6bc60c483b021f99c0d4b9e80a8e19492bd2f31ffed159a356a7 30-cypress.patch.noauto
2eebc4501d40edf92c5302b25dea554807caba6abd22a3569d708db8a057085d74a3ecdac2adab54edb0619cf3d74884e1d44ef95d991a069dd473279819b974 30-cypress.patch.noauto
01c446ac4528d8e12d3544f603ba32a0bf0d5a3a72f9f8f3726725f9d225ee447d2fea4ee2ddf10b36498cc01f2ecf51175dbfcc6376aac4c8002f52c6a04299 30-ubuntu-32bit-fixes.patch.noauto
f974ab36cd6fa49c1d4613203a4f2152723e4952a185dfb6349bc4ca8ee1a7a9d0477bea136c54248271de30a4e584734ba41e8ec41bf274b04074622888ae39 31-32bit_fix_tests.patch.noauto
964e7ca107cc731be2be7bf6813aca760ca1c6e6f6b3748103c1e6baef4d25e41442752a72f5e5daed2b1c6c4f96c9aebbb7114247e8a5047511fbd035767aeb 32-PurgeQueue.cc-cast.patch
......@@ -540,8 +551,10 @@ abb3cab9c01cc3d6d42a9858678059a8c9c43bda2649bf97b489fdc205eb10ae27f9fb7302062e0f
908169df45177240d2dcc721fe1637c521789aed56c3b3400ed3ba9c73d93634e4369258fb0e0395dc27053be26229ee8f370e445f0e69d01f551a710a29d407 37-fix_tests.patch
2584ceb68b50423fac386ce83ad194f22aa574e11b99916e712471bacba28486d2639a8fe63d97c5697f33270c0de99db1f0e76eb43b14cc47c6de7da6903fde 42-no-virtualenvs.patch
aea43c2a99f16f7fccf33aeca3565077bb2274816ca68db64b672addc85bde5c479bc9ad0fb33dbde79c9390f9acf1d98545e20e311e40dd428dad5ed02f0651 43-aarch64-erasure.patch
741a0f83ecf1a8298bcc8cb8ab9f25f6d27cfe69367150a8821fde445efe20a255b3f1296dc92003a2956475e3f15f3d0ac920be280dd03ac3f311c754dbb890 44-cmake-buildtype.patch
e47d736d3ab1417758fc5f92798a77272b978799e6d9f0728b2036d6cc5975c6c10f8dc4590c2e1cb31e1e9fc03c582394b30727e315a6889de524fc8bf95369 44-LogClock.h.patch
f89c913a53e2806c59508d26f5dc72abb428c7e4e3b7c1aeb6eaf92744ea9a13cac2f00a2ac90f91ad7682f66d876a5fffedd10feeceecd71a944793581da443 44-staticcast.patch
85d0009b0d1442af81d115402cdbd17667d85314030e1748a4656c1ee798b02efdcff41ccb374a6b63f7bf012bf1756b61e75c5d2b6399c329a6e62024ad0011 44-node_modules.patch
44e40fc4c33cf609a16940520bffb1906614bc5c447df7a56fcd012070ee7977edcd226d9ce3b10b7f306b8f64ed21b5182b0def61887267ba1b338804c9cbb1 missing-include.patch
b95ec157f9c77177afd3deb8e3485bb5f10e1b634a15617d14e09b08d6680d32201ecb249ea5ea98127a312e1fdb22fdbe9f0216690291a2849419aa7ab81610 44-missing-include.patch
8269647901e2c10d2e85668abb34f44a0b394460fb89e4eeb6dbf3eb964764a9e4b56b1ec90ab07da428ae33ad3147ea51830fdd83654e1b8b4c179db90b5e1f 44-missing-include2.patch
"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment