aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2021-02-24 22:33:55 +0000
committerLeo <thinkabit.ukim@gmail.com>2021-02-28 05:58:33 +0000
commitbda7c8920108ee03865b4e13146fdf6493267442 (patch)
treed54d637233c8e877a246af0d6c35c71001308bdd
parent36f0c756e1c043e87a1f1d993f6dfd57690999b7 (diff)
downloadaports-bda7c8920108ee03865b4e13146fdf6493267442.tar.gz
aports-bda7c8920108ee03865b4e13146fdf6493267442.tar.bz2
aports-bda7c8920108ee03865b4e13146fdf6493267442.tar.xz
community/ceph: upgrade to 15.2.9
* take over maintainership
-rw-r--r--community/ceph/31-32bit_fix_tests.patch.noauto30
-rw-r--r--community/ceph/44-missing-include.patch (renamed from community/ceph/missing-include.patch)6
-rw-r--r--community/ceph/44-signal_handler.patch16
-rw-r--r--community/ceph/APKBUILD15
4 files changed, 50 insertions, 17 deletions
diff --git a/community/ceph/31-32bit_fix_tests.patch.noauto b/community/ceph/31-32bit_fix_tests.patch.noauto
index 9bab7ed1e7..d8b5d065c2 100644
--- a/community/ceph/31-32bit_fix_tests.patch.noauto
+++ b/community/ceph/31-32bit_fix_tests.patch.noauto
@@ -12,33 +12,47 @@ diff -uNr ceph-15.2.4/src/test/objectstore/test_bdev.cc ceph-15.2.4-arm32_fix_te
string s(1048576, 'a' + (i % 28));
bl.append(s);
}
-diff -uNr ceph-15.2.4/src/test/objectstore/test_bluefs.cc ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bluefs.cc
---- ceph-15.2.4/src/test/objectstore/test_bluefs.cc 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bluefs.cc 2020-11-17 15:41:32.066147015 +1030
-@@ -206,7 +206,7 @@
+--- a/src/test/objectstore/test_bluefs.cc
++++ b/src/test/objectstore/test_bluefs.cc
+@@ -237,7 +237,7 @@
}
TEST(BlueFS, very_large_write) {
-- // we'll write a ~3G file, so allocate more than that for the whole fs
+- // we'll write a ~5G file, so allocate more than that for the whole fs
+ // we'll write a ~1G file, so allocate more than that for the whole fs
uint64_t size = 1048576 * 1024 * 8ull;
TempBdev bdev{size};
BlueFS fs(g_ceph_context);
-@@ -228,7 +228,7 @@
+@@ -260,12 +260,12 @@
BlueFS::FileWriter *h;
ASSERT_EQ(0, fs.mkdir("dir"));
ASSERT_EQ(0, fs.open_for_write("dir", "bigfile", &h, false));
- for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
+ for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
h->append(buf, sizeof(buf));
+ total_written += sizeof(buf);
}
fs.fsync(h);
-@@ -239,7 +239,7 @@
- ASSERT_EQ(0, fs.open_for_read("dir", "bigfile", &h));
+- for (unsigned i = 0; i < 2*1024*1048576ull / sizeof(buf); ++i) {
++ for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
+ h->append(buf, sizeof(buf));
+ total_written += sizeof(buf);
+ }
+@@ -278,7 +278,7 @@
bufferlist bl;
BlueFS::FileReaderBuffer readbuf(10485760);
+ ASSERT_EQ(h->file->fnode.size, total_written);
- for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
+ for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
bl.clear();
fs.read(h, &readbuf, i * sizeof(buf), sizeof(buf), &bl, NULL);
int r = memcmp(buf, bl.c_str(), sizeof(buf));
+@@ -288,7 +288,7 @@
+ }
+ ASSERT_EQ(0, r);
+ }
+- for (unsigned i = 0; i < 2*1024*1048576ull / sizeof(buf); ++i) {
++ for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
+ bl.clear();
+ fs.read(h, &readbuf, i * sizeof(buf), sizeof(buf), &bl, NULL);
+ int r = memcmp(buf, bl.c_str(), sizeof(buf));
diff --git a/community/ceph/missing-include.patch b/community/ceph/44-missing-include.patch
index fdb3630d45..eaa6f949af 100644
--- a/community/ceph/missing-include.patch
+++ b/community/ceph/44-missing-include.patch
@@ -1,14 +1,14 @@
Taken from Arch Linux
+upstream MR https://github.com/ceph/ceph/commit/f16ac13c13eceed7adb5a4a04a3372b921e63031
-diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc
-index aa6edbc18b..90c551c179 100644
--- a/src/tools/rbd/action/Bench.cc
+++ b/src/tools/rbd/action/Bench.cc
-@@ -9,6 +9,7 @@
+@@ -9,6 +9,8 @@
#include "common/ceph_mutex.h"
#include "include/types.h"
#include "global/signal_handler.h"
+#include <atomic>
++#include <chrono>
#include <iostream>
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics/stats.hpp>
diff --git a/community/ceph/44-signal_handler.patch b/community/ceph/44-signal_handler.patch
new file mode 100644
index 0000000000..723b31503e
--- /dev/null
+++ b/community/ceph/44-signal_handler.patch
@@ -0,0 +1,16 @@
+submitted upstream as: https://github.com/ceph/ceph/pull/39689
+
+--- a/src/global/signal_handler.h
++++ b/src/global/signal_handler.h
+@@ -20,9 +20,9 @@
+
+ typedef void (*signal_handler_t)(int);
+
+-#ifdef HAVE_SIGDESCR_NP
++#if defined(HAVE_SIGDESCR_NP)
+ # define sig_str(signum) sigdescr_np(signum)
+-#elif HAVE_REENTRANT_STRSIGNAL
++#elif defined(HAVE_REENTRANT_STRSIGNAL)
+ # define sig_str(signum) strsignal(signum)
+ #else
+ # define sig_str(signum) sys_siglist[signum]
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD
index c3a195fc5c..cf0c254d24 100644
--- a/community/ceph/APKBUILD
+++ b/community/ceph/APKBUILD
@@ -1,9 +1,10 @@
# Contributor: John Coyle <dx9err@gmail.com>
# Contributor: Iggy Jackson <iggy@kws1.com>
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=ceph
-pkgver=15.2.8
-pkgrel=2
+pkgver=15.2.9
+pkgrel=0
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
@@ -114,7 +115,8 @@ source="https://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
41-test-uint.patch
42-no-virtualenvs.patch
43-aarch64-erasure.patch
- missing-include.patch
+ 44-missing-include.patch
+ 44-signal_handler.patch
"
subpackages="
@@ -573,13 +575,13 @@ _pkg() {
done
}
-sha512sums="66c7322575165b4747955ac9de34f9f9e2d4361c8cd8498819383883045601b92f786c4336c79369d6f019db1c4524c492faa40cdceed7fc1b2b373ca6ab5065 ceph_15.2.8.orig.tar.gz
+sha512sums="1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff ceph_15.2.9.orig.tar.gz
110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121 ceph.confd
ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3 ceph.initd
c608f11cf358d76daf5281467a4ea941a81474fbe7f5faa41f7f4d0abaf9136a01576bbb1ab24bdd7bc91a49f66bd7f0a84717de5ec27250d74dd1e47e3b5dd3 10-musl-fixes.patch
427ab410aeb02d49c5caa8ff68c7b8df325229823d625b7069cd48c66dd9e129e742270850fb2be2238eb6fa12b8256845b4d94426ca96b2a9187b2726e78423 20-pci.patch
90042a4a3ef7374080974a2ebcbf88b75ef97c1a1770552205818c333cca802e98077d9244a14177d084e31da1b49c8fcca9c604a743286aa1bb8e7e4f208a4b 30-32bit_fix.patch.noauto
-b2c463fd0d0a2a3925e66578df17648bd2b0ec1a6c7cf70a494d0f44dab34d95b57df77740bbb1752bdd783e881b7f3d3e108de3179d7a609ff6b0d5c9f07012 31-32bit_fix_tests.patch.noauto
+2c4f3af87912918b28783002ec77908b96432060a96343b01a362bed642b5d58c25701e319b63c536c74b0c8f2b762f0a92711c983f1c36c308dfc5869aea95c 31-32bit_fix_tests.patch.noauto
26ecf3dd0220d878ccf98cac2adbc201e5be31b1b966698d95a7058a8bd6c3640520764e85b2a1645fd1474be576ed03f80811f8ccc96bada71b05fe51b06ef8 32-fix_ceph_thread_timeout.patch
62ef2e7e10978e9e0eef4a094bc63d9890f0d7e71eba0f0e15baede0597ea179a77924f6dbd4d4a9c9b151c9ae934f4c10d7f2a17ee960b017f942ec57c7af35 34-fix_cpu_detection.patch
8a3e902309238ae6917b4c5fe9fa371dad3ba8e01848f462a9b67ad8d69b8370a8957f6c88462a7016319fd323eb6d6c31415734db56485a8a8b279d2705aff5 35-fix_ErasureCodeShec.patch
@@ -589,4 +591,5 @@ ec8aec40fa04fd475834801232d644ff3baf0777b59dcede36a6caa0d63b2c379292253babc3678b
445f3ca5c582e0fe02c18061c98cd13358684091c8a45262552c8af75d1c52320de538f6b71765e8267d326402a14c21dc27fd0781c997ab491bd3cdecc2e49f 41-test-uint.patch
270e214292fab2d6a7a0a0a6e3df9ee6b2e2d37397607329f19822fe41f18cec0f4365adca9b78647d0aa78e9a22a7c95300fa71390a7885716e52991fbb8ecc 42-no-virtualenvs.patch
aea43c2a99f16f7fccf33aeca3565077bb2274816ca68db64b672addc85bde5c479bc9ad0fb33dbde79c9390f9acf1d98545e20e311e40dd428dad5ed02f0651 43-aarch64-erasure.patch
-588d89ae2dd01cb28ce965bcefef5dfdc6488fb205117d9d151588c518e7e3845531a8fafd4c03d17418ff51f015dad5bcb271dd66cabc8478ce27e0ec081b8f missing-include.patch"
+fd6d008dbd62db03299d5562eb15c76cf4a6a58b8f2d872c298254777bd6ab8484ec884d3b24c5e9f40a3118af391e24b1eff835b6370921b5f81b4d25d8b9d2 44-missing-include.patch
+12019e8af8f9ce53e66c9acbe6ed8f1e3d3efbbd8bf924beb13d5fbe250053fb4185a6ef46193137ca636a5dda4d19a931e8060a4dd217cdcad77dc9db42065c 44-signal_handler.patch"