proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-08-12 02:45:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drop patches applied upstream

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-11-02 13:25:11 +01:00
parent b0bfb1b036
commit 0c5de8e1f3
3 changed files with 0 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
patches/0018-fix-lib-fmt-v9-compat.patch
View File

@ -1,140 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 3 May 2023 10:36:10 +0200
Subject: [PATCH] try to fix lib fmt v9 compat
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
ceph/debian/rules | 2 ++
src/common/Journald.cc | 1 +
src/common/LogEntry.h | 18 ++++++++++++++++++
src/osd/osd_types_fmt.h | 14 +++++++-------
4 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index 9f49deabb..c4eeebaee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ ifneq (,$(filter with_system_libs,$(DEB_BUILD_OPTIONS)))
extraopts += -DWITH_SYSTEM_PMDK=ON
endif
+export DEB_CXXFLAGS_MAINT_APPEND += -DFMT_DEPRECATED_OSTREAM
+
%:
dh $@ --buildsystem=cmake --with javahelper,python3,systemd --parallel
diff --git a/src/common/Journald.cc b/src/common/Journald.cc
index e3ae2d358..a1321c7ee 100644
--- a/src/common/Journald.cc
+++ b/src/common/Journald.cc
@@ -21,6 +21,7 @@
#include "common/LogEntry.h"
#include "log/Entry.h"
#include "log/SubsystemMap.h"
+#include "msg/msg_fmt.h"
namespace ceph::logging {
diff --git a/src/common/LogEntry.h b/src/common/LogEntry.h
index 124a20799..3ddebbd30 100644
--- a/src/common/LogEntry.h
+++ b/src/common/LogEntry.h
@@ -15,7 +15,10 @@
#ifndef CEPH_LOGENTRY_H
#define CEPH_LOGENTRY_H
+#include <fmt/format.h>
+
#include "include/utime.h"
+#include "msg/msg_fmt.h"
#include "msg/msg_types.h"
#include "common/entity_name.h"
#include "ostream_temp.h"
@@ -191,4 +194,19 @@ inline std::ostream& operator<<(std::ostream& out, const LogEntry& e)
<< e.channel << " " << e.prio << " " << e.msg;
}
+template <> struct fmt::formatter<EntityName> : fmt::formatter<std::string_view> {
+ template <typename FormatContext>
+ auto format(const EntityName& e, FormatContext& ctx) {
+ return formatter<std::string_view>::format(e.to_str(), ctx);
+ }
+};
+
+template <> struct fmt::formatter<LogEntry> : fmt::formatter<std::string_view> {
+ template <typename FormatContext>
+ auto format(const LogEntry& e, FormatContext& ctx) {
+ return fmt::format_to(ctx.out(), "{} {} ({}) {} : {} {} {}",
+ e.stamp, e.name, e.rank, e.seq, e.channel, e.prio, e.msg);
+ }
+};
+
#endif
diff --git a/src/osd/osd_types_fmt.h b/src/osd/osd_types_fmt.h
index 23c0e8a3b..a3c9eb61c 100644
--- a/src/osd/osd_types_fmt.h
+++ b/src/osd/osd_types_fmt.h
@@ -13,7 +13,7 @@ struct fmt::formatter<osd_reqid_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const osd_reqid_t& req_id, FormatContext& ctx)
+ auto format(const osd_reqid_t& req_id, FormatContext& ctx) const
{
return fmt::format_to(ctx.out(), "{}.{}:{}", req_id.name, req_id.inc,
req_id.tid);
@@ -25,7 +25,7 @@ struct fmt::formatter<pg_shard_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const pg_shard_t& shrd, FormatContext& ctx)
+ auto format(const pg_shard_t& shrd, FormatContext& ctx) const
{
if (shrd.is_undefined()) {
return fmt::format_to(ctx.out(), "?");
@@ -42,7 +42,7 @@ struct fmt::formatter<eversion_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const eversion_t& ev, FormatContext& ctx)
+ auto format(const eversion_t& ev, FormatContext& ctx) const
{
return fmt::format_to(ctx.out(), "{}'{}", ev.epoch, ev.version);
}
@@ -53,7 +53,7 @@ struct fmt::formatter<chunk_info_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const chunk_info_t& ci, FormatContext& ctx)
+ auto format(const chunk_info_t& ci, FormatContext& ctx) const
{
return fmt::format_to(ctx.out(), "(len: {} oid: {} offset: {} flags: {})",
ci.length, ci.oid, ci.offset,
@@ -66,7 +66,7 @@ struct fmt::formatter<object_manifest_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const object_manifest_t& om, FormatContext& ctx)
+ auto format(const object_manifest_t& om, FormatContext& ctx) const
{
fmt::format_to(ctx.out(), "manifest({}", om.get_type_name());
if (om.is_redirect()) {
@@ -83,7 +83,7 @@ struct fmt::formatter<object_info_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const object_info_t& oi, FormatContext& ctx)
+ auto format(const object_info_t& oi, FormatContext& ctx) const
{
fmt::format_to(ctx.out(), "{}({} {} {} s {} uv {}", oi.soid, oi.version,
oi.last_reqid, (oi.flags ? oi.get_flag_string() : ""), oi.size,
@@ -110,7 +110,7 @@ struct fmt::formatter<pg_t> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
- auto format(const pg_t& pg, FormatContext& ctx)
+ auto format(const pg_t& pg, FormatContext& ctx) const
{
return fmt::format_to(ctx.out(), "{}.{:x}", pg.pool(), pg.m_seed);
}

123
patches/0019-define-iterators-without-std-iterator.patch
View File

@ -1,123 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 3 May 2023 13:25:08 +0200
Subject: [PATCH] define iterators without std::iterator<>
> std::iterator<> is deprecated in C++17, so let's just
> define the required traits directly.
cherry-picked/backported from upstream PRs:
https://github.com/ceph/ceph/pull/45419/commits
https://github.com/ceph/ceph/pull/45198/commits
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
.../btree/string_kv_node_layout.h | 27 +++++++++++--------
src/include/rados/librados.hpp | 7 ++++-
src/include/xlist.h | 15 +++++++++--
3 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
index 9948a4292..1bd95415a 100644
--- a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
+++ b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
@@ -294,7 +294,7 @@ class StringKVInnerNodeLayout {
friend class delta_inner_t;
public:
template <bool is_const>
- class iter_t : public std::iterator<std::input_iterator_tag, StringKVInnerNodeLayout> {
+ class iter_t {
friend class StringKVInnerNodeLayout;
template <typename iterator, typename const_iterator>
@@ -312,17 +312,22 @@ public:
uint16_t index) : node(parent), index(index) {}
public:
- iter_t(const iter_t &) = default;
- iter_t(iter_t &&) = default;
- iter_t &operator=(const iter_t &) = default;
- iter_t &operator=(iter_t &&) = default;
-
- operator iter_t<!is_const>() const {
- static_assert(!is_const);
- return iter_t<!is_const>(node, index);
- }
-
+ using iterator_category = std::input_iterator_tag;
+ using value_type = StringKVInnerNodeLayout;
+ using difference_type = std::ptrdiff_t;
+ using pointer = StringKVInnerNodeLayout*;
using reference = iter_t&;
+
+ iter_t(const iter_t &) = default;
+ iter_t(iter_t &&) = default;
+ iter_t &operator=(const iter_t &) = default;
+ iter_t &operator=(iter_t &&) = default;
+
+ operator iter_t<!is_const>() const {
+ static_assert(!is_const);
+ return iter_t<!is_const>(node, index);
+ }
+
iter_t &operator*() { return *this; }
iter_t *operator->() { return this; }
diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index b40d7bf9a..712a5da82 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -104,8 +104,13 @@ inline namespace v14_2_0 {
};
CEPH_RADOS_API std::ostream& operator<<(std::ostream& os, const librados::ObjectCursor& oc);
- class CEPH_RADOS_API NObjectIterator : public std::iterator <std::forward_iterator_tag, ListObject> {
+ class CEPH_RADOS_API NObjectIterator {
public:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = ListObject;
+ using difference_type = std::ptrdiff_t;
+ using pointer = ListObject*;
+ using reference = ListObject&;
static const NObjectIterator __EndObjectIterator;
NObjectIterator(): impl(NULL) {}
~NObjectIterator();
diff --git a/src/include/xlist.h b/src/include/xlist.h
index 733a318a9..73e6d8d53 100644
--- a/src/include/xlist.h
+++ b/src/include/xlist.h
@@ -159,10 +159,15 @@ public:
remove(_back);
}
- class iterator: std::iterator<std::forward_iterator_tag, T> {
+ class iterator {
private:
item *cur;
public:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = T;
+ using difference_type = std::ptrdiff_t;
+ using pointer = T*;
+ using reference = T&;
iterator(item *i = 0) : cur(i) {}
T operator*() { return static_cast<T>(cur->_item); }
iterator& operator++() {
@@ -183,10 +188,16 @@ public:
iterator begin() { return iterator(_front); }
iterator end() { return iterator(NULL); }
- class const_iterator: std::iterator<std::forward_iterator_tag, T> {
+ class const_iterator {
private:
item *cur;
public:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = T;
+ using difference_type = std::ptrdiff_t;
+ using pointer = const T*;
+ using reference = const T&;
+
const_iterator(item *i = 0) : cur(i) {}
const T operator*() { return static_cast<const T>(cur->_item); }
const_iterator& operator++() {

2
patches/series
View File

@ -11,6 +11,4 @@
0015-d-control-drop-outdated-build-dependencies-and-bump-.patch 0015-d-control-drop-outdated-build-dependencies-and-bump-.patch
0016-d-rules-fix-no-restart-on-upgrade.patch 0016-d-rules-fix-no-restart-on-upgrade.patch
0017-python3.10-pep-620.patch 0017-python3.10-pep-620.patch
0018-fix-lib-fmt-v9-compat.patch
0019-define-iterators-without-std-iterator.patch
0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch 0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch