From 12fe4ded30781395bf5064afa5e2b35f6eb4d73b Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 25 2021 20:20:12 +0000 Subject: ceph-16.1.0-0.1.snapshot ceph-16.1.0-944-ge53ee8bd --- diff --git a/.ceph.metadata b/.ceph.metadata index 591bcf7..8de24cf 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -0503649d7c7d9268cb61b03bbe839106988f87d7 SOURCES/ceph-15.2.9.tar.gz +0442c17a30e4186910df44137f321d9ca9287b0e SOURCES/ceph-16.1.0-944-ge53ee8bd.tar.bz2 diff --git a/README.md b/README.md index 50a81b7..cb39b07 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Branch names follow convention like `c-sig-storage-ceph-VERSION>` as descibed on [Naming and Patterns for Mapping Git Branches to Koji Tags] (https://wiki.centos.org/BrianStinson/GitBranchesandKojiTags) -* c8-sig-storage-ceph-octopus: CentOS-8 +* c8-sig-storage-ceph-pacific: CentOS-8 * ... Instructions for building the ceph package for the CentOS Storage SIG @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.9-1.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.1.0-0.1.snapshot.el8.src.rpm diff --git a/SOURCES/0001-src-common-crc32c_intel_fast.patch b/SOURCES/0001-src-common-crc32c_intel_fast.patch index 503dcd7..b0e718c 100644 --- a/SOURCES/0001-src-common-crc32c_intel_fast.patch +++ b/SOURCES/0001-src-common-crc32c_intel_fast.patch @@ -1,112 +1,55 @@ ---- ceph-15.1.0/src/common/crc32c_intel_fast_asm.s.orig 2020-03-04 14:37:33.431024436 -0500 -+++ ceph-15.1.0/src/common/crc32c_intel_fast_asm.s 2020-03-04 15:11:22.859388783 -0500 -@@ -40,6 +40,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +--- ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s.orig 2020-05-26 08:34:32.226201974 -0400 ++++ ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s 2020-05-26 17:19:32.497201974 -0400 +@@ -1,5 +1,5 @@ + ; +-; Copyright 2012-2013 Intel Corporation All Rights Reserved. ++; Copyright 2012-2015 Intel Corporation All Rights Reserved. + ; All rights reserved. + ; + ; http://opensource.org/licenses/BSD-3-Clause +@@ -59,6 +59,19 @@ + xor rbx, rbx ;; rbx = crc1 = 0; + xor r10, r10 ;; r10 = crc2 = 0; -+ - ; crcB3 MACRO to implement crc32 on 3 %%bSize-byte blocks - %macro crcB3 3 - %define %%bSize %1 ; 1/3 of buffer size -@@ -672,3 +673,22 @@ - ; inform linker that this doesn't require executable stack - section .note.GNU-stack noalloc noexec nowrite progbits ++ cmp len, %%bSize*3*2 ++ jbe %%non_prefetch ++ ++ %assign i 0 ++ %rep %%bSize/8 - 1 ++ crc32 rax, bufptmp ;; update crc0 ++ crc32 rbx, bufptmp ;; update crc1 ++ crc32 r10, bufptmp ;; update crc2 ++ %assign i (i+8) ++ %endrep ++ jmp %%next %+ %1 ++ ++%%non_prefetch: + %assign i 0 + %rep %%bSize/8 - 1 + crc32 rax, bufptmp ;; update crc0 +@@ -66,6 +79,8 @@ + crc32 r10, bufptmp ;; update crc2 + %assign i (i+8) + %endrep ++ ++%%next %+ %1: + crc32 rax, bufptmp ;; update crc0 + crc32 rbx, bufptmp ;; update crc1 + ; SKIP ;crc32 r10, bufptmp ;; update crc2 +@@ -180,12 +195,15 @@ + %define crc_init_dw r8d %endif -+ -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+ -+SECTION .note.gnu.property align=8 noexec ; section number 22, const -+ -+ db 04H, 00H, 00H, 00H, 20H, 00H, 00H, 00H ; 0000 _ .... ... -+ db 05H, 00H, 00H, 00H, 47H, 4EH, 55H, 00H ; 0008 _ ....GNU. -+ db 00H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0010 _ ........ -+ db 00H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0018 _ ........ -+ db 01H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0020 _ ........ -+ db 00H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0028 _ ........ -+ db 04H, 00H, 00H, 00H, 10H, 00H, 00H, 00H ; 0030 _ ........ -+ db 05H, 00H, 00H, 00H, 47H, 4EH, 55H, 00H ; 0038 _ ....GNU. -+ db 02H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0040 _ ........ -+ db 03H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0048 _ ........ -+ -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ---- ceph-15.1.0/src/common/crc32c_intel_fast_zero_asm.s.orig 2020-03-04 15:13:06.577071783 -0500 -+++ ceph-15.1.0/src/common/crc32c_intel_fast_zero_asm.s 2020-03-04 15:13:49.873356953 -0500 -@@ -654,3 +654,22 @@ - ; inform linker that this doesn't require executable stack - section .note.GNU-stack noalloc noexec nowrite progbits - %endif -+ -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+ -+SECTION .note.gnu.property align=8 noexec ; section number 22, const -+ -+ db 04H, 00H, 00H, 00H, 20H, 00H, 00H, 00H ; 0000 _ .... ... -+ db 05H, 00H, 00H, 00H, 47H, 4EH, 55H, 00H ; 0008 _ ....GNU. -+ db 00H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0010 _ ........ -+ db 00H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0018 _ ........ -+ db 01H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0020 _ ........ -+ db 00H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0028 _ ........ -+ db 04H, 00H, 00H, 00H, 10H, 00H, 00H, 00H ; 0030 _ ........ -+ db 05H, 00H, 00H, 00H, 47H, 4EH, 55H, 00H ; 0038 _ ....GNU. -+ db 02H, 00H, 00H, 0C0H, 04H, 00H, 00H, 00H ; 0040 _ ........ -+ db 03H, 00H, 00H, 00H, 00H, 00H, 00H, 00H ; 0048 _ ........ -+ -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ---- ceph-15.1.0/src/yasm-wrapper.orig 2020-03-09 12:57:37.603837466 -0400 -+++ ceph-15.1.0/src/yasm-wrapper 2020-03-09 13:02:31.496796609 -0400 -@@ -1,10 +1,11 @@ --#!/bin/sh -e -+#!/bin/sh - # libtool and yasm do not get along. - # filter out any crap that libtool feeds us that yasm does not understand. - #echo $0: got $* - new="" - touch="" -+object="" - while [ -n "$*" ]; do - case "$1" in - -f ) -@@ -29,6 +30,12 @@ - touch="$1" - shift - ;; -+ -o ) -+ shift -+ object="$1" -+ new="$new -o $1" -+ shift -+ ;; - * ) - new="$new $1" - shift -@@ -39,6 +46,25 @@ - #echo $0: yasm $new - yasm $new +- ++ endbranch + push rdi + push rbx -+INDEXOFNOTEGNUPROPLINE=$(readelf -S -W ${object} | grep ".note.gnu.property") -+ -+if [ -n "${INDEXOFNOTEGNUPROPLINE}" ]; then -+ -+ STARTOFSECTHDRLINE=$(readelf -h ${object} | grep "Start of section headers:") -+ SIZEOFSECTHDRLINE=$(readelf -h ${object} | grep "Size of section headers:") -+ -+ STARTOFSECTHDR=$(echo ${STARTOFSECTHDRLINE} | cut -d ' ' -f 5) -+ SIZEOFSECTHDR=$(echo ${SIZEOFSECTHDRLINE} | cut -d ' ' -f 5) -+ INDEXOFNOTEGNUPROPFRAG=$(echo ${INDEXOFNOTEGNUPROPLINE} | cut -d '.' -f 1) -+ -+ INDEXOFNOTEGNUPROP=$(echo ${INDEXOFNOTEGNUPROPFRAG} | grep -Eo "[[:digit:]]+") -+ -+ OFFSET=$(( ${STARTOFSECTHDR} + 4 + ( ${SIZEOFSECTHDR} * ${INDEXOFNOTEGNUPROP} ) )) -+ -+ printf '\x07' | dd of=${object} bs=1 seek=${OFFSET} count=1 conv=notrunc &> /dev/null -+ -+fi + mov rax, crc_init ;; rax = crc_init; + ++ cmp len, 8 ++ jb less_than_8 + - [ -n "$touch" ] && touch $touch + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - true diff --git a/SOURCES/0003-src-common-bitstr.h.patch b/SOURCES/0003-src-common-bitstr.h.patch index 3c7a516..ed2b0ce 100644 --- a/SOURCES/0003-src-common-bitstr.h.patch +++ b/SOURCES/0003-src-common-bitstr.h.patch @@ -8,3 +8,14 @@ namespace ceph { class Formatter; +--- ceph-15.2.4/src/global/signal_handler.h.orig 2020-07-17 12:57:54.763628429 -0400 ++++ ceph-15.2.4/src/global/signal_handler.h 2020-07-17 12:58:10.610628429 -0400 +@@ -16,6 +16,8 @@ + #define CEPH_GLOBAL_SIGNAL_HANDLER_H + + #include ++#include ++ + #include "acconfig.h" + + typedef void (*signal_handler_t)(int); diff --git a/SOURCES/0004-src-CMakeLists.txt.patch b/SOURCES/0004-src-CMakeLists.txt.patch new file mode 100644 index 0000000..f3f2e36 --- /dev/null +++ b/SOURCES/0004-src-CMakeLists.txt.patch @@ -0,0 +1,12 @@ +--- ceph-16.0.0/src/CMakeLists.txt.orig 2021-01-25 13:45:15.316053258 -0500 ++++ ceph-16.0.0/src/CMakeLists.txt 2021-01-25 13:43:34.418305591 -0500 +@@ -29,7 +29,8 @@ + -D_THREAD_SAFE + -D__STDC_FORMAT_MACROS + -D_FILE_OFFSET_BITS=64 +- -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION) ++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION ++ -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) + if(LINUX) + add_definitions("-D_GNU_SOURCE") + endif() diff --git a/SOURCES/0006-src-blk-CMakeLists.txt.patch b/SOURCES/0006-src-blk-CMakeLists.txt.patch new file mode 100644 index 0000000..548f676 --- /dev/null +++ b/SOURCES/0006-src-blk-CMakeLists.txt.patch @@ -0,0 +1,11 @@ +--- ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt.orig 2021-02-01 08:16:26.719517641 -0500 ++++ ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt 2021-02-01 08:16:47.810092341 -0500 +@@ -25,7 +25,7 @@ + zoned/HMSMRDevice.cc) + endif() + +-add_library(blk ${libblk_srcs}) ++add_library(blk STATIC ${libblk_srcs}) + target_include_directories(blk PRIVATE "./") + + if(HAVE_LIBAIO) diff --git a/SOURCES/0007-src-test-neorados-CMakeLists.txt.patch b/SOURCES/0007-src-test-neorados-CMakeLists.txt.patch new file mode 100644 index 0000000..a160f38 --- /dev/null +++ b/SOURCES/0007-src-test-neorados-CMakeLists.txt.patch @@ -0,0 +1,11 @@ +--- ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt.orig 2021-02-01 08:25:18.006965821 -0500 ++++ ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt 2021-02-01 08:25:34.244407147 -0500 +@@ -19,7 +19,7 @@ + target_link_libraries(ceph_test_neorados_op_speed + libneorados fmt::fmt ${unittest_libs}) + +-add_library(neoradostest-support common_tests.cc) ++add_library(neoradostest-support STATIC common_tests.cc) + target_link_libraries(neoradostest-support + libneorados fmt::fmt) + diff --git a/SOURCES/0008-cmake-modules-Finduring.cmake.patch b/SOURCES/0008-cmake-modules-Finduring.cmake.patch new file mode 100644 index 0000000..61b93f7 --- /dev/null +++ b/SOURCES/0008-cmake-modules-Finduring.cmake.patch @@ -0,0 +1,11 @@ +--- ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake.orig 2021-02-01 08:45:39.316108287 -0500 ++++ ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake 2021-02-01 08:45:59.813665378 -0500 +@@ -5,7 +5,7 @@ + # uring_FOUND - True if uring found. + + find_path(URING_INCLUDE_DIR liburing.h) +-find_library(URING_LIBRARIES liburing.a liburing) ++find_library(URING_LIBRARIES liburing.so liburing) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR) diff --git a/SOURCES/0009-librgw-notifications-initialize-kafka-and-amqp.patch b/SOURCES/0009-librgw-notifications-initialize-kafka-and-amqp.patch new file mode 100644 index 0000000..17a12ae --- /dev/null +++ b/SOURCES/0009-librgw-notifications-initialize-kafka-and-amqp.patch @@ -0,0 +1,63 @@ +From 178f6bdac97b57300bbe0956633cf686a7e3ccee Mon Sep 17 00:00:00 2001 +From: Yuval Lifshitz +Date: Fri, 12 Mar 2021 08:56:45 +0200 +Subject: [PATCH] librgw/notifications: initialize kafka and amqp + +Fixes: https://tracker.ceph.com/issues/49738 + +Signed-off-by: Yuval Lifshitz +--- + src/rgw/librgw.cc | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc +index 012cc54c3b..a5351dbe7c 100644 +--- a/src/rgw/librgw.cc ++++ b/src/rgw/librgw.cc +@@ -53,6 +53,12 @@ + #include "rgw_http_client.h" + #include "rgw_http_client_curl.h" + #include "rgw_perf_counters.h" ++#ifdef WITH_RADOSGW_AMQP_ENDPOINT ++#include "rgw_amqp.h" ++#endif ++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT ++#include "rgw_kafka.h" ++#endif + + #include "services/svc_zone.h" + +@@ -617,6 +623,17 @@ namespace rgw { + /* ignore error */ + } + ++#ifdef WITH_RADOSGW_AMQP_ENDPOINT ++ if (!rgw::amqp::init(cct.get())) { ++ derr << "ERROR: failed to initialize AMQP manager" << dendl; ++ } ++#endif ++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT ++ if (!rgw::kafka::init(cct.get())) { ++ derr << "ERROR: failed to initialize Kafka manager" << dendl; ++ } ++#endif ++ + return 0; + } /* RGWLib::init() */ + +@@ -645,6 +662,12 @@ namespace rgw { + rgw_shutdown_resolver(); + rgw_http_client_cleanup(); + rgw::curl::cleanup_curl(); ++#ifdef WITH_RADOSGW_AMQP_ENDPOINT ++ rgw::amqp::shutdown(); ++#endif ++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT ++ rgw::kafka::shutdown(); ++#endif + + rgw_perf_stop(g_ceph_context); + +-- +2.26.2 + diff --git a/SOURCES/0010-os-bluestore-strip-trailing-slash-for-directory-list.patch b/SOURCES/0010-os-bluestore-strip-trailing-slash-for-directory-list.patch new file mode 100644 index 0000000..036f0fc --- /dev/null +++ b/SOURCES/0010-os-bluestore-strip-trailing-slash-for-directory-list.patch @@ -0,0 +1,57 @@ +From 3aa31813980d22719277a04797df48310acdff66 Mon Sep 17 00:00:00 2001 +From: Jonas Jelten +Date: Mon, 15 Mar 2021 23:21:07 +0100 +Subject: [PATCH] os/bluestore: strip trailing slash for directory listings + +Calls to BlueRocksEnv::GetChildren may contain a trailing / in the +queried directory, which is stripped away with this patch. + +If it's not stripped, the directory entry is not found in BlueFS: +``` +10 bluefs readdir db/ +20 bluefs readdir dir db/ not found + 3 rocksdb: [db/db_impl/db_impl_open.cc:1785] Persisting Option File error: OK +``` + +Fixes: https://tracker.ceph.com/issues/49815 +Signed-off-by: Jonas Jelten +--- + src/os/bluestore/BlueFS.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc +index ea39626aef..62b9d27f58 100644 +--- a/src/os/bluestore/BlueFS.cc ++++ b/src/os/bluestore/BlueFS.cc +@@ -3493,9 +3493,14 @@ + + int BlueFS::readdir(const string& dirname, vector *ls) + { ++ std::string dname = dirname; ++ // dirname may contain a trailing / ++ if (!dname.empty() && dname.back() == '/') { ++ dname.pop_back(); ++ } + std::lock_guard l(lock); +- dout(10) << __func__ << " " << dirname << dendl; +- if (dirname.empty()) { ++ dout(10) << __func__ << " " << dname << dendl; ++ if (dname.empty()) { + // list dirs + ls->reserve(dir_map.size() + 2); + for (auto& q : dir_map) { +@@ -3503,9 +3508,9 @@ + } + } else { + // list files in dir +- map::iterator p = dir_map.find(dirname); ++ map::iterator p = dir_map.find(dname); + if (p == dir_map.end()) { +- dout(20) << __func__ << " dir " << dirname << " not found" << dendl; ++ dout(20) << __func__ << " dir " << dname << " not found" << dendl; + return -ENOENT; + } + DirRef dir = p->second; +-- +2.26.2 + diff --git a/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch b/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch deleted file mode 100644 index f724841..0000000 --- a/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html -index d5f4b70d..8ff160de 100644 ---- a/doc/_templates/layout.html -+++ b/doc/_templates/layout.html -@@ -5,16 +5,6 @@ - - - --{# Google Analytics #} -- - {% endblock %} - - {%- macro searchform(classes, button) %} --- -2.26.2 - diff --git a/SOURCES/doc-_templates-layout-stripped-download-links.patch b/SOURCES/doc-_templates-layout-stripped-download-links.patch deleted file mode 100644 index 9d26197..0000000 --- a/SOURCES/doc-_templates-layout-stripped-download-links.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html -index 8ff160de..85eba08d 100644 ---- a/doc/_templates/layout.html -+++ b/doc/_templates/layout.html -@@ -42,16 +42,6 @@ - {# Collect the nav links, forms, and other content for toggling #} -
-
    --
  • -- -- --
    • - {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %} - {% if pagename == name.lower() %} -
  • {{name}} -@@ -74,23 +64,7 @@ -
    -
    -

    {fmt}

    --

    A modern formatting library

    --
    -- {% set name = 'fmt' if version.split('.')[0]|int >= 3 else 'cppformat' %} -- -- Download -- -- --
      -- {% for v in versions.split(',') %} -- {% set name = 'fmt' if v.split('.')[0]|int >= 3 else 'cppformat' %} --
    • Version {{v}} --
      • -- {% endfor %} --
    --
    -+

    Small, safe and fast formatting library for C++

    -
    -
    - {% endif %} --- -2.26.2 - diff --git a/SOURCES/doc-build-do-not-create-virtual-environment.patch b/SOURCES/doc-build-do-not-create-virtual-environment.patch deleted file mode 100644 index 1197217..0000000 --- a/SOURCES/doc-build-do-not-create-virtual-environment.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/doc/build.py b/doc/build.py -index 73426713..af3313d1 100755 ---- a/doc/build.py -+++ b/doc/build.py -@@ -7,16 +7,6 @@ from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE - - versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2', '6.2.0', '6.2.1'] - --def create_build_env(dirname='virtualenv'): -- # Create virtualenv. -- if not os.path.exists(dirname): -- check_call(['virtualenv', dirname]) -- import sysconfig -- scripts_dir = os.path.basename(sysconfig.get_path('scripts')) -- activate_this_file = os.path.join(dirname, scripts_dir, 'activate_this.py') -- with open(activate_this_file) as f: -- exec(f.read(), dict(__file__=activate_this_file)) -- - def build_docs(version='dev', **kwargs): - doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__))) - work_dir = kwargs.get('work_dir', '.') -@@ -78,5 +68,4 @@ def build_docs(version='dev', **kwargs): - return html_dir - - if __name__ == '__main__': -- create_build_env() - build_docs(sys.argv[1]) --- -2.26.2 - diff --git a/SOURCES/doc-build-removed-all-pip-internet-stuff.patch b/SOURCES/doc-build-removed-all-pip-internet-stuff.patch deleted file mode 100644 index 77c0ce2..0000000 --- a/SOURCES/doc-build-removed-all-pip-internet-stuff.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/doc/build.py b/doc/build.py -index e5bcbf3b..73426713 100755 ---- a/doc/build.py -+++ b/doc/build.py -@@ -4,27 +4,9 @@ - from __future__ import print_function - import errno, os, shutil, sys, tempfile - from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE --from distutils.version import LooseVersion - - versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2', '6.2.0', '6.2.1'] - --def pip_install(package, commit=None, **kwargs): -- "Install package using pip." -- min_version = kwargs.get('min_version') -- if min_version: -- from pkg_resources import get_distribution, DistributionNotFound -- try: -- installed_version = get_distribution(os.path.basename(package)).version -- if LooseVersion(installed_version) >= min_version: -- print('{} {} already installed'.format(package, min_version)) -- return -- except DistributionNotFound: -- pass -- if commit: -- package = 'git+https://github.com/{0}.git@{1}'.format(package, commit) -- print('Installing {0}'.format(package)) -- check_call(['pip', 'install', package]) -- - def create_build_env(dirname='virtualenv'): - # Create virtualenv. - if not os.path.exists(dirname): -@@ -34,30 +16,6 @@ def create_build_env(dirname='virtualenv'): - activate_this_file = os.path.join(dirname, scripts_dir, 'activate_this.py') - with open(activate_this_file) as f: - exec(f.read(), dict(__file__=activate_this_file)) -- # Import get_distribution after activating virtualenv to get info about -- # the correct packages. -- from pkg_resources import get_distribution, DistributionNotFound -- # Upgrade pip because installation of sphinx with pip 1.1 available on Travis -- # is broken (see #207) and it doesn't support the show command. -- pip_version = get_distribution('pip').version -- if LooseVersion(pip_version) < LooseVersion('1.5.4'): -- print("Updating pip") -- check_call(['pip', 'install', '--upgrade', 'pip']) -- # Upgrade distribute because installation of sphinx with distribute 0.6.24 -- # available on Travis is broken (see #207). -- try: -- distribute_version = get_distribution('distribute').version -- if LooseVersion(distribute_version) <= LooseVersion('0.6.24'): -- print("Updating distribute") -- check_call(['pip', 'install', '--upgrade', 'distribute']) -- except DistributionNotFound: -- pass -- # Install Sphinx and Breathe. -- pip_install('sphinx-doc/sphinx', '12b83372ac9316e8cbe86e7fed889296a4cc29ee', -- min_version='1.4.1.dev20160531') -- pip_install('michaeljones/breathe', -- '129222318f7c8f865d2631e7da7b033567e7f56a', -- min_version='4.2.0') - - def build_docs(version='dev', **kwargs): - doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__))) --- -2.26.2 - diff --git a/SOURCES/doc-build-use-python3.patch b/SOURCES/doc-build-use-python3.patch deleted file mode 100644 index 88c71b5..0000000 --- a/SOURCES/doc-build-use-python3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 2af32d53..0ad2d602 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -4,11 +4,13 @@ if (NOT DOXYGEN) - return () - endif () - -+find_package(PythonInterp -+ QUIET REQUIRED) - find_program(SPHINX_EXECUTABLE - NAMES sphinx-build sphinx-build-3) - add_custom_target(doc - COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION} -+ ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION} - SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ --- -2.26.2 - diff --git a/SOURCES/doc-build-use-sphinx-build-3.patch b/SOURCES/doc-build-use-sphinx-build-3.patch deleted file mode 100644 index b082a7a..0000000 --- a/SOURCES/doc-build-use-sphinx-build-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index f3dae606..2af32d53 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -4,8 +4,11 @@ if (NOT DOXYGEN) - return () - endif () - -+find_program(SPHINX_EXECUTABLE -+ NAMES sphinx-build sphinx-build-3) - add_custom_target(doc -- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION} -+ COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE} -+ ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION} - SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ -diff --git a/doc/build.py b/doc/build.py -index af3313d1..44b31343 100755 ---- a/doc/build.py -+++ b/doc/build.py -@@ -49,7 +49,8 @@ def build_docs(version='dev', **kwargs): - raise CalledProcessError(p.returncode, cmd) - html_dir = os.path.join(work_dir, 'html') - main_versions = reversed(versions[-3:]) -- check_call(['sphinx-build', -+ sphinx_build = os.environ.get('SPHINX_EXECUTABLE', 'sphinx-build') -+ check_call([sphinx_build, - '-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir), - '-Dversion=' + version, '-Drelease=' + version, - '-Aversion=' + version, '-Aversions=' + ','.join(main_versions), --- -2.26.2 - diff --git a/SOURCES/doc-index-removed-GitHub-iframe.patch b/SOURCES/doc-index-removed-GitHub-iframe.patch deleted file mode 100644 index dc21d94..0000000 --- a/SOURCES/doc-index-removed-GitHub-iframe.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/doc/index.rst b/doc/index.rst -index d02ab0b0..a4d113d8 100644 ---- a/doc/index.rst -+++ b/doc/index.rst -@@ -191,12 +191,3 @@ Ease of Use - just three header files and no external dependencies. - A permissive MIT `license `_ allows - using the library both in open-source and commercial projects. -- --.. raw:: html -- -- GitHub Repository -- --
    -- --
    --- -2.26.2 - diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index f9627a5..572fde9 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -23,16 +23,25 @@ %global _hardened_build 1 %bcond_with make_check +%bcond_with zbd %bcond_with cmake_verbose_logging -%bcond_without ceph_test_package +%bcond_with ceph_test_package %ifarch s390 s390x %bcond_with tcmalloc %else %bcond_without tcmalloc %endif - %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux +%ifarch x86_64 +%global _system_pmdk 1 +%bcond_without rbd_rwl_cache +%bcond_without rbd_ssd_cache +%else +%global _system_pmdk 0 +%bcond_with rbd_rwl_cache +%bcond_with rbd_ssd_cache +%endif %if 0%{?rhel} >= 8 %bcond_with cephfs_java %else @@ -49,10 +58,17 @@ %bcond_with amqp_endpoint %bcond_with cephfs_java %bcond_with kafka_endpoint +%bcond_with libradosstriper %ifarch x86_64 aarch64 ppc64le %bcond_without lttng +%global _system_pmdk 1 +%bcond_without rbd_rwl_cache +%bcond_without rbd_ssd_cache %else %bcond_with lttng +%global _system_pmdk 0 +%bcond_with rbd_rwl_cache +%bcond_with rbd_ssd_cache %endif %bcond_with ocf %bcond_with selinux @@ -62,6 +78,7 @@ %endif %endif %bcond_with seastar +%bcond_with jaeger %if 0%{?fedora} || 0%{?suse_version} >= 1500 # distros that ship cmd2 and/or colorama %bcond_without cephfs_shell @@ -82,16 +99,24 @@ %endif %endif +%if 0%{?suse_version} +%if !0%{?is_opensuse} +# SLE does not support luarocks +%bcond_with lua_packages +%else +%global luarocks_package_name lua53-luarocks +%bcond_without lua_packages +%endif +%else +%global luarocks_package_name luarocks +%bcond_without lua_packages +%endif + %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} -%if 0%{?rhel} == 7 -%define __python %{__python3} -%endif -# unify libexec for all targets -%global _libexecdir %{_exec_prefix}/lib # disable dwz which compresses the debuginfo %global _find_debuginfo_dwz_opts %{nil} @@ -100,8 +125,8 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.9 -Release: 2%{?dist} +Version: 16.1.0 +Release: 0.1.snapshot%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -117,11 +142,18 @@ License: (LGPLv2.1 or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD a Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz +#Source0: %%{?_remote_tarball_prefix}ceph-%%{version}.tar.gz +# https://2.chacra.ceph.com/r/ceph/pacific/abe639e639eb... +Source0: ceph-16.1.0-944-ge53ee8bd.tar.bz2 Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0002: 0002-src-common-CMakeLists.txt.patch Patch0003: 0003-src-common-bitstr.h.patch -Patch0004: 0004-src-include-config-h-in-cmake.patch +Patch0004: 0004-src-CMakeLists.txt.patch +Patch0006: 0006-src-blk-CMakeLists.txt.patch +Patch0007: 0007-src-test-neorados-CMakeLists.txt.patch +Patch0008: 0008-cmake-modules-Finduring.cmake.patch +Patch0009: 0009-librgw-notifications-initialize-kafka-and-amqp.patch +Patch0010: 0010-os-bluestore-strip-trailing-slash-for-directory-list.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -146,21 +178,17 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel %endif BuildRequires: gperf -%if 0%{?rhel} == 7 -BuildRequires: cmake3 > 3.5 -%else BuildRequires: cmake > 3.5 -%endif BuildRequires: cryptsetup -BuildRequires: fuse-devel -BuildRequires: fmt-devel -%if 0%{?rhel} == 7 -# devtoolset offers newer make and valgrind-devel, but the old ones are good -# enough. -BuildRequires: devtoolset-8-gcc-c++ >= 8.3.1-3.1 -%else +BuildRequires: fuse3-devel +# BuildRequires: gcc-toolset-9-gcc-c++ +# BuildRequires: gcc-toolset-9-annobin +# BuildRequires: gcc-toolset-9-libstdc++-devel +# %%if 0%%{with seastar} +# BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3 +# %%else BuildRequires: gcc-c++ -%endif +# %%endif BuildRequires: gdbm %if 0%{with tcmalloc} %if 0%{?fedora} || 0%{?rhel} @@ -173,8 +201,15 @@ BuildRequires: gperftools-devel >= 2.4 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 +%if 0%{?fedora} +BuildRequires: rocksdb-devel +Requires: rocksdb +%endif +BuildRequires: liburing-devel BuildRequires: pkgconfig(libudev) BuildRequires: libnl3-devel BuildRequires: liboath-devel @@ -189,7 +224,6 @@ BuildRequires: pkgconfig BuildRequires: procps BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: snappy-devel BuildRequires: sudo BuildRequires: pkgconfig(udev) @@ -199,46 +233,47 @@ BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet -BuildRequires: yasm +BuildRequires: nasm +BuildRequires: lua-devel %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel %endif %if 0%{with kafka_endpoint} BuildRequires: librdkafka-devel %endif +%if 0%{with lua_packages} +BuildRequires: %{luarocks_package_name} +%endif %if 0%{with make_check} BuildRequires: jq BuildRequires: libuuid-devel -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-bcrypt -BuildRequires: python%{python3_version_nodots}-nose -BuildRequires: python%{python3_version_nodots}-requests -BuildRequires: python%{python3_version_nodots}-dateutil -%else BuildRequires: python%{python3_pkgversion}-bcrypt 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: socat %endif -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-six -BuildRequires: python%{python3_version_nodots}-virtualenv -%else -BuildRequires: python%{python3_pkgversion}-six -BuildRequires: python%{python3_pkgversion}-virtualenv +%if 0%{with zbd} +BuildRequires: libzbd-devel %endif -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-coverage -%else -BuildRequires: python%{python3_pkgversion}-coverage +%if 0%{with jaeger} +BuildRequires: bison +BuildRequires: flex +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: json-devel %endif -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-pyOpenSSL -%else -BuildRequires: python%{python3_pkgversion}-pyOpenSSL +%if 0%{?suse_version} +BuildRequires: nlohmann_json-devel %endif -BuildRequires: socat +BuildRequires: libevent-devel +BuildRequires: yaml-cpp-devel +%endif +%if 0%{?_system_pmdk} +BuildRequires: libpmem-devel +BuildRequires: libpmemobj-devel %endif %if 0%{with seastar} BuildRequires: c-ares-devel @@ -250,6 +285,19 @@ BuildRequires: protobuf-devel BuildRequires: ragel BuildRequires: systemtap-sdt-devel BuildRequires: yaml-cpp-devel +BuildRequires: gcc-toolset-9-libubsan-devel +BuildRequires: gcc-toolset-9-libasan-devel +BuildRequires: gcc-toolset-9-libatomic-devel +# %%if 0%%{?fedora} +# BuildRequires: libubsan +# BuildRequires: libasan +# BuildRequires: libatomic +# %%endif +# %%if 0%%{?rhel} +# BuildRequires: gcc-toolset-9-libubsan-devel +# BuildRequires: gcc-toolset-9-libasan-devel +# BuildRequires: gcc-toolset-9-libatomic-devel +# %%endif %endif ################################################################################# # distro-conditional dependencies @@ -281,6 +329,7 @@ BuildRequires: golang-github-prometheus-prometheus %endif %if 0%{?fedora} || 0%{?rhel} Requires: systemd +BuildRequires: boost-devel BuildRequires: boost-random BuildRequires: nss-devel BuildRequires: keyutils-libs-devel @@ -293,11 +342,7 @@ BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-Cython -%else BuildRequires: python%{python3_pkgversion}-Cython -%endif BuildRequires: python%{python3_pkgversion}-prettytable BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -313,22 +358,13 @@ BuildRequires: xmlsec1-nss %endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-jwt -BuildRequires: python%{python3_version_nodots}-scipy -%else BuildRequires: python%{python3_pkgversion}-cherrypy BuildRequires: python%{python3_pkgversion}-jwt BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug -%endif -%if 0%{?rhel} == 7 -BuildRequires: python%{python3_version_nodots}-pyOpenSSL -%else BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif -%endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 @@ -428,12 +464,9 @@ Base is the package that includes all the files shared amongst ceph servers Summary: Utility to bootstrap Ceph clusters BuildArch: noarch Requires: lvm2 -%if 0%{?suse_version} -Requires: apparmor-abstractions -%endif Requires: python%{python3_pkgversion} %if 0%{?weak_deps} -Recommends: podman +Recommends: podman >= 2.0.2 %endif %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed @@ -453,6 +486,9 @@ Requires: python%{python3_pkgversion}-cephfs = %{_epoch_prefix}%{version}-%{rele Requires: python%{python3_pkgversion}-rgw = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} +%if 0%{with jaeger} +Requires: libjaeger = %{_epoch_prefix}%{version}-%{release} +%endif %if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-prettytable %endif @@ -489,13 +525,16 @@ Group: System/Filesystems Provides: ceph-test:/usr/bin/ceph-monstore-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} -Recommends: nvme-cli +Recommends: nvme-cli %if 0%{?suse_version} -Requires: smartmontools +Requires: smartmontools %else -Recommends: smartmontools +Recommends: smartmontools %endif %endif +%if 0%{with jaeger} +Requires: libjaeger = %{_epoch_prefix}%{version}-%{release} +%endif %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file system. One or more instances of ceph-mon form a Paxos part-time @@ -509,15 +548,9 @@ Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr-modules-core = %{_epoch_prefix}%{version}-%{release} -%if 0%{?rhel} == 7 -Requires: python%{python3_version_nodots}-six -%else -Requires: python%{python3_pkgversion}-six -%endif %if 0%{?weak_deps} Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release} Recommends: python%{python3_pkgversion}-influxdb @@ -567,47 +600,25 @@ Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-numpy -Requires: python%{python3_pkgversion}-scipy -%if 0%{?rhel} == 7 -Requires: numpy -Requires: scipy +%if 0%{?fedora} || 0%{?suse_version} +Requires: python%{python3_pkgversion}-scikit-learn %endif +Requires: python3-scipy %description mgr-diskprediction-local ceph-mgr-diskprediction-local is a ceph-mgr module that tries to predict disk failures using local algorithms and machine-learning databases. -%package mgr-diskprediction-cloud -Summary: Ceph Manager module for cloud-based disk failure prediction -BuildArch: noarch -%if 0%{?suse_version} -Group: System/Filesystems -%endif -Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-grpcio -Requires: python%{python3_pkgversion}-protobuf -%description mgr-diskprediction-cloud -ceph-mgr-diskprediction-cloud is a ceph-mgr module that tries to predict -disk failures using services in the Google cloud. - %package mgr-modules-core Summary: Ceph Manager modules which are always enabled BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems %endif -%if 0%{?rhel} == 7 -Requires: python%{python3_version_nodots}-bcrypt -Requires: python%{python3_version_nodots}-pyOpenSSL -Requires: python%{python3_version_nodots}-requests -Requires: python%{python3_version_nodots}-PyYAML -Requires: python%{python3_version_nodots}-dateutil -%else Requires: python%{python3_pkgversion}-bcrypt Requires: python%{python3_pkgversion}-pecan Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-dateutil -%endif %if 0%{?fedora} || 0%{?rhel} >= 8 Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-pyyaml @@ -681,6 +692,17 @@ Requires: python%{python3_pkgversion} %description fuse FUSE based client for Ceph distributed network file system +%package -n cephfs-mirror +Summary: Ceph daemon for mirroring CephFS snapshots +%if 0%{?suse_version} +Group: System/Filesystems +%endif +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +%description -n cephfs-mirror +Daemon for mirroring CephFS snapshots between Ceph clusters. + %package -n rbd-fuse Summary: Ceph fuse-based client %if 0%{?suse_version} @@ -736,12 +758,23 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} Requires: mailcap %endif +%if 0%{?weak_deps} +Recommends: gawk +%endif %description radosgw RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the object store that aims to implement a superset of Amazon's S3 service as well as the OpenStack Object Storage ("Swift") API. +%package -n cephfs-top +Summary: top(1) like utility for Ceph Filesystem +BuildArch: noarch +Requires: python%{python3_pkgversion}-rados +%description -n cephfs-top +This package provides a top(1) like utility to display Ceph Filesystem metrics +in realtime. + %if %{with ocf} %package resource-agents Summary: OCF-compliant resource agents for Ceph daemons @@ -768,11 +801,11 @@ Requires: sudo Requires: libstoragemgmt Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} -Recommends: nvme-cli +Recommends: nvme-cli %if 0%{?suse_version} -Requires: smartmontools +Requires: smartmontools %else -Recommends: smartmontools +Recommends: smartmontools %endif %endif %description osd @@ -865,7 +898,7 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea Provides: python-rgw = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-rgw < %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rgw -This package contains Python 3 libraries for interacting with Cephs RADOS +This package contains Python 3 libraries for interacting with Ceph RADOS gateway. %package -n python%{python3_pkgversion}-rados @@ -879,7 +912,7 @@ Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Provides: python-rados = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rados -This package contains Python 3 libraries for interacting with Cephs RADOS +This package contains Python 3 libraries for interacting with Ceph RADOS object store. %if 0%{with libradosstriper} @@ -954,7 +987,7 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea Provides: python-rbd = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rbd -This package contains Python 3 libraries for interacting with Cephs RADOS +This package contains Python 3 libraries for interacting with Ceph RADOS block device. %package -n libcephfs2 @@ -985,7 +1018,21 @@ Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release} %description -n libcephfs-devel This package contains libraries and headers needed to develop programs -that use Cephs distributed file system. +that use Ceph distributed file system. + +%if 0%{with jaeger} +%package -n libjaeger +Summary: Ceph distributed file system tracing library +%if 0%{?suse_version} +Group: System/Libraries +%endif +Provides: libjaegertracing.so.0()(64bit) +Provides: libopentracing.so.1()(64bit) +Provides: libthrift.so.0.13.0()(64bit) +%description -n libjaeger +This package contains libraries needed to provide distributed +tracing for Ceph. +%endif %package -n python%{python3_pkgversion}-cephfs Summary: Python 3 libraries for Ceph distributed file system @@ -999,7 +1046,7 @@ Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version} Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-cephfs -This package contains Python 3 libraries for interacting with Cephs distributed +This package contains Python 3 libraries for interacting with Ceph distributed file system. %package -n python%{python3_pkgversion}-ceph-argparse @@ -1052,8 +1099,8 @@ Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: xmlstarlet Requires: jq Requires: socat -Requires: gtest -Requires: gmock +BuildRequires: gtest-devel +BuildRequires: gmock-devel %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -1146,13 +1193,13 @@ Summary: Prometheus alerts for a Ceph deplyoment BuildArch: noarch Group: System/Monitoring %description prometheus-alerts -This package provides Ceph’s default alerts for Prometheus. +This package provides Ceph default alerts for Prometheus. ################################################################################# # common ################################################################################# %prep -%autosetup -p1 +%autosetup -p1 -n ceph-16.1.0-944-ge53ee8bd %ifarch x86_64 patch -p1 < %{SOURCE1} %endif @@ -1162,9 +1209,10 @@ patch -p1 < %{SOURCE1} # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 %define _lto_cflags %{nil} -%if 0%{?rhel} == 7 -. /opt/rh/devtoolset-8/enable -%endif +# . /opt/rh/gcc-toolset-9/enable +# %%if 0%%{with seastar} && 0%%{?rhel} +# . /opt/rh/gcc-toolset-9/enable +# %%endif %if 0%{with cephfs_java} # Find jni.h @@ -1183,9 +1231,19 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" +%if 0%{with seastar} +# seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk() +export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') +%endif + # Parallel build settings ... +%ifarch s390 s390x +CEPH_MFLAGS_JOBS="-j1" +CEPH_SMP_NCPUS="1" +%else CEPH_MFLAGS_JOBS="%{?_smp_mflags}" CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') +%endif %if 0%{?__isa_bits} == 32 # 32-bit builds can use 3G memory max, which is not enough even for -j2 CEPH_SMP_NCPUS="1" @@ -1195,21 +1253,13 @@ echo "Available memory:" free -h echo "System limits:" ulimit -a -%ifarch aarch64 -CEPH_SMP_NCPUS="4" -%else -%ifarch aarch64 -CEPH_SMP_NCPUS="4" -%else if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then - mem_per_process=2700 + mem_per_process=2500 max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p") max_jobs="$(($max_mem / $mem_per_process))" test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits" test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits" fi -%endif -%endif export CEPH_SMP_NCPUS export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS" @@ -1217,11 +1267,9 @@ env | sort mkdir build cd build -%if 0%{?rhel} == 7 -%global cmake cmake3 -%endif %{cmake} .. \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_CONFIG=rpmbuild \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ @@ -1231,6 +1279,7 @@ cd build -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=%{python3_version} \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ @@ -1254,13 +1303,11 @@ cd build %if 0%{with ocf} -DWITH_OCF=ON \ %endif - -DWITH_REENTRANT_STRSIGNAL=OFF \ - -DWITH_SYSTEM_BOOST=OFF \ -%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 - -DWITH_BOOST_CONTEXT=ON \ -%else - -DWITH_BOOST_CONTEXT=OFF \ +%if 0%{?fedora} + -DWITH_SYSTEM_ROCKSDB=ON \ %endif + -DWITH_SYSTEM_LIBURING=OFF \ + -DWITH_SYSTEM_BOOST=OFF \ %if 0%{with cephfs_shell} -DWITH_CEPHFS_SHELL=ON \ %endif @@ -1279,10 +1326,28 @@ cd build %else -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ %endif +%if 0%{without lua_packages} + -DWITH_RADOSGW_LUA_PACKAGES=OFF \ +%endif +%if 0%{with zbd} + -DWITH_ZBD=ON \ +%endif %if 0%{with cmake_verbose_logging} -DCMAKE_VERBOSE_MAKEFILE=ON \ %endif +%if 0%{with rbd_rwl_cache} + -DWITH_RBD_RWL=ON \ +%endif +%if 0%{with rbd_ssd_cache} + -DWITH_RBD_SSD_CACHE=ON \ +%endif -DBOOST_J=$CEPH_SMP_NCPUS \ +%if 0%{with ceph_test_package} + -DWITH_SYSTEM_GTEST=ON \ +%endif +%if 0%{?_system_pmdk} + -DWITH_SYSTEM_PMDK:BOOL=ON \ +%endif -DWITH_GRAFANA=ON %if %{with cmake_verbose_logging} @@ -1292,7 +1357,7 @@ cat ./CMakeFiles/CMakeError.log export VERBOSE=1 export V=1 -make "$CEPH_MFLAGS_JOBS" +make "$CEPH_MFLAGS_JOBS" %if 0%{with make_check} @@ -1309,6 +1374,11 @@ make DESTDIR=%{buildroot} install # we have dropped sysvinit bits rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph popd +%if 0%{with seastar} +# package crimson-osd with the name of ceph-osd +install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd +%endif + install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap %if 0%{?fedora} || 0%{?rhel} install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph @@ -1317,12 +1387,13 @@ install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name} %endif install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf -install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset +install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_presetdir}/50-ceph.preset mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf +install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm mkdir -p %{buildroot}%{_sharedstatedir}/cephadm @@ -1394,7 +1465,7 @@ install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildro %{_bindir}/osdmaptool %{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-run -%{_libexecdir}/systemd/system-preset/50-ceph.preset +%{_presetdir}/50-ceph.preset %{_sbindir}/ceph-create-keys %dir %{_libexecdir}/ceph %{_libexecdir}/ceph/ceph_common.sh @@ -1466,21 +1537,7 @@ fi %postun base /sbin/ldconfig -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph.target -%endif -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. - SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph - if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then - source $SYSCONF_CEPH - fi -fi %pre -n cephadm getent group cephadm >/dev/null || groupadd -r cephadm @@ -1626,13 +1683,7 @@ fi %endif %postun mds -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-mds@\*.service ceph-mds.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mds@\*.service ceph-mds.target -%endif 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. @@ -1650,9 +1701,6 @@ fi %dir %{_datadir}/ceph/mgr %{_datadir}/ceph/mgr/mgr_module.* %{_datadir}/ceph/mgr/mgr_util.* -%if 0%{?rhel} == 7 -%{_datadir}/ceph/mgr/__pycache__ -%endif %{_unitdir}/ceph-mgr@.service %{_unitdir}/ceph-mgr.target %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr @@ -1679,13 +1727,7 @@ fi %endif %postun mgr -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-mgr@\*.service ceph-mgr.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mgr@\*.service ceph-mgr.target -%endif 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. @@ -1724,19 +1766,6 @@ if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%files mgr-diskprediction-cloud -%{_datadir}/ceph/mgr/diskprediction_cloud - -%post mgr-diskprediction-cloud -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%postun mgr-diskprediction-cloud -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - %files mgr-modules-core %dir %{_datadir}/ceph/mgr %{_datadir}/ceph/mgr/alerts @@ -1747,6 +1776,8 @@ fi %{_datadir}/ceph/mgr/insights %{_datadir}/ceph/mgr/iostat %{_datadir}/ceph/mgr/localpool +%{_datadir}/ceph/mgr/mds_autoscaler +%{_datadir}/ceph/mgr/mirroring %{_datadir}/ceph/mgr/orchestrator %{_datadir}/ceph/mgr/osd_perf_query %{_datadir}/ceph/mgr/osd_support @@ -1756,6 +1787,8 @@ fi %{_datadir}/ceph/mgr/rbd_support %{_datadir}/ceph/mgr/restful %{_datadir}/ceph/mgr/selftest +%{_datadir}/ceph/mgr/snap_schedule +%{_datadir}/ceph/mgr/stats %{_datadir}/ceph/mgr/status %{_datadir}/ceph/mgr/telegraf %{_datadir}/ceph/mgr/telemetry @@ -1832,13 +1865,7 @@ fi %endif %postun mon -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-mon@\*.service ceph-mon.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mon@\*.service ceph-mon.target -%endif 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. @@ -1855,9 +1882,51 @@ fi %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* %{_sbindir}/mount.fuse.ceph +%{_mandir}/man8/mount.fuse.ceph.8* %{_unitdir}/ceph-fuse@.service %{_unitdir}/ceph-fuse.target +%files -n cephfs-mirror +%{_bindir}/cephfs-mirror +%{_mandir}/man8/cephfs-mirror.8* +%{_unitdir}/cephfs-mirror@.service +%{_unitdir}/cephfs-mirror.target + +%post -n cephfs-mirror +%if 0%{?suse_version} +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl preset cephfs-mirror@\*.service cephfs-mirror.target >/dev/null 2>&1 || : +fi +%endif +%if 0%{?fedora} || 0%{?rhel} +%systemd_post cephfs-mirror@\*.service cephfs-mirror.target +%endif +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start cephfs-mirror.target >/dev/null 2>&1 || : +fi + +%preun -n cephfs-mirror +%if 0%{?suse_version} +%service_del_preun cephfs-mirror@\*.service cephfs-mirror.target +%endif +%if 0%{?fedora} || 0%{?rhel} +%systemd_preun cephfs-mirror@\*.service cephfs-mirror.target +%endif + +%postun -n cephfs-mirror +%systemd_postun cephfs-mirror@\*.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. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; 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 || : + fi +fi + %files -n rbd-fuse %{_bindir}/rbd-fuse %{_mandir}/man8/rbd-fuse.8* @@ -1890,13 +1959,7 @@ fi %endif %postun -n rbd-mirror -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target -%endif 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. @@ -1938,13 +2001,7 @@ fi %postun immutable-object-cache test -n "$FIRST_ARG" || FIRST_ARG=$1 -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target -%endif if [ $FIRST_ARG -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. @@ -1960,6 +2017,8 @@ fi %files -n rbd-nbd %{_bindir}/rbd-nbd %{_mandir}/man8/rbd-nbd.8* +%dir %{_libexecdir}/rbd-nbd +%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce %files radosgw %{_bindir}/ceph-diff-sorted @@ -1967,6 +2026,8 @@ fi %{_bindir}/radosgw-token %{_bindir}/radosgw-es %{_bindir}/radosgw-object-expirer +%{_bindir}/rgw-gap-list +%{_bindir}/rgw-gap-list-comparator %{_bindir}/rgw-orphan-list %{_libdir}/libradosgw.so* %{_mandir}/man8/radosgw.8* @@ -1998,13 +2059,7 @@ fi %postun radosgw /sbin/ldconfig -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-radosgw@\*.service ceph-radosgw.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-radosgw@\*.service ceph-radosgw.target -%endif 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. @@ -2020,6 +2075,7 @@ fi %files osd %{_bindir}/ceph-clsinfo %{_bindir}/ceph-bluestore-tool +%{_bindir}/ceph-erasure-code-tool %{_bindir}/ceph-objectstore-tool %{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osd @@ -2065,13 +2121,7 @@ fi %endif %postun osd -%if 0%{?suse_version} -DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target -%endif -%if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target -%endif 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. @@ -2158,6 +2208,8 @@ fi %if %{with lttng} %{_libdir}/librbd_tp.so.* %endif +%dir %{_libdir}/ceph/librbd +%{_libdir}/ceph/librbd/libceph_*.so* %post -n librbd1 -p /sbin/ldconfig @@ -2214,8 +2266,19 @@ fi %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h %{_includedir}/cephfs/ceph_ll_client.h +%dir %{_includedir}/cephfs/metrics +%{_includedir}/cephfs/metrics/Types.h %{_libdir}/libcephfs.so +%if %{with jaeger} +%files -n libjaeger +%{_libdir}/libopentracing.so.* +%{_libdir}/libthrift.so.* +%{_libdir}/libjaegertracing.so.* +%post -n libjaeger -p /sbin/ldconfig +%postun -n libjaeger -p /sbin/ldconfig +%endif + %files -n python%{python3_pkgversion}-cephfs %{python3_sitearch}/cephfs.cpython*.so %{python3_sitearch}/cephfs-*.egg-info @@ -2238,13 +2301,17 @@ fi %{_bindir}/cephfs-shell %endif +%files -n cephfs-top +%{python3_sitelib}/cephfs_top-*.egg-info +%{_bindir}/cephfs-top +%{_mandir}/man8/cephfs-top.8* + %if 0%{with ceph_test_package} %files -n ceph-test %{_bindir}/ceph-client-debug %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench %{_bindir}/ceph_multi_stress_watch -%{_bindir}/ceph_erasure_code %{_bindir}/ceph_erasure_code_benchmark %{_bindir}/ceph_omapbench %{_bindir}/ceph_objectstore_bench @@ -2262,6 +2329,9 @@ fi %{_bindir}/ceph-coverage %{_bindir}/ceph-debugpack %{_bindir}/ceph-dedup-tool +%if 0%{with seastar} +%{_bindir}/crimson-store-nbd +%endif %{_mandir}/man8/ceph-debugpack.8* %dir %{_libdir}/ceph %{_libdir}/ceph/ceph-monstore-update-crush.sh @@ -2371,7 +2441,6 @@ if [ $1 -eq 0 ]; then fi fi exit 0 - %endif %files grafana-dashboards @@ -2392,34 +2461,64 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog -* Sat Feb 27 2021 Kaleb S. KEITHLEY - 2:15.2.9-2 -- ceph 15.2.9, strsignal is not MT-SAFE. (It is also not reentrant, but -not being MT-SAFE is more correct, and the more important issue.) +* Tue Mar 23 2021 Kaleb S. KEITHLEY - 2:16.1.0-0.1.snapshot +- 16.1.0 RC (ceph-16.1.0-944-ge53ee8bd plus fix trailing slash bluestore) -* Fri Feb 26 2021 Kaleb S. KEITHLEY - 2:15.2.9-1 -- ceph 15.2.9 GA +* Wed Sep 16 2020 Kaleb S. KEITHLEY - 2:15.2.5-1 +- ceph 15.2.5 GA -* Mon Dec 28 2020 Kaleb S. KEITHLEY - 2:15.2.8-1 -- ceph 15.2.8 GA +* Wed Jul 29 2020 Richard W.M. Jones - 2:15.2.4-11 +- Rebuild against fmt 7. -* Mon Dec 7 2020 Kaleb S. KEITHLEY - 2:15.2.7-1 -- ceph 15.2.7 GA +* Mon Jul 27 2020 Fedora Release Engineering - 2:15.2.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Nov 23 2020 Kaleb S. KEITHLEY - 2:15.2.6-1 -- ceph 15.2.6 GA +* Tue Jul 21 2020 Kaleb S. KEITHLEY - 2:15.2.4-9 +- %cmake_build and %cmake_install -* Fri Oct 9 2020 Kaleb S. KEITHLEY - 2:15.2.5-1 -- ceph 15.2.5 GA +* Mon Jul 20 2020 Kaleb S. KEITHLEY - 2:15.2.4-8 +- see 15.2.4-4 (f33-java11) for real this time +- and use %make_install macro + +* Mon Jul 20 2020 Kaleb S. KEITHLEY - 2:15.2.4-7 +- see 15.2.4-3, hopefully for real this time +- and use %make_install macro + +* Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-6 +- see 15.2.4-4 + +* Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-5 +- see 15.2.4-3 -* Tue Aug 11 2020 Kaleb S. KEITHLEY - 2:15.2.4-2 -- ceph 15.2.4, bump epoch, ceph-14.x.x is 2 (sigh) so -15 must also be 2 +* Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 -* Fri Aug 7 2020 Kaleb S. KEITHLEY - 1:15.2.4-1 +* Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-3 +- use `ld -r -z ibt -z shstk...` instead of magic hackery to get CET ibt + and shstk. N.B. updated yasm in f33/rawhide now has support for + .note.gnu.properties so even this will go away in the next build +- signal_handler.cc, use HAVE_REENTRANT_STRSIGNAL, strsignal(3) + +* Fri Jul 10 2020 Jiri Vanek - 2:15.2.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jul 1 2020 Kaleb S. KEITHLEY - 2:15.2.4-1 - ceph 15.2.4 GA -* Mon Jun 1 2020 Kaleb S. KEITHLEY - 1:15.2.3-1 +* Tue Jun 23 2020 Kaleb S. KEITHLEY +- explicit BuildRequires python3-setuptools + +* Mon Jun 1 2020 Kaleb S. KEITHLEY - 2:15.2.3-1 - ceph 15.2.3 GA +* Tue May 26 2020 Kaleb S. KEITHLEY - 2:15.2.2-3 +- ceph 15.2.2, CET enable src/common/crc32c_intel_*_asm.s; shstk, ibt +- and other fixes +- see https://github.com/intel/isa-l/blob/master/crc/crc32_iscsi_00.asm + +* Tue May 26 2020 Miro Hrončok - 2:15.2.2-2 +- Rebuilt for Python 3.9 + * Mon May 18 2020 Kaleb S. KEITHLEY - 2:15.2.2-1 - ceph 15.2.2 GA