* [gentoo-commits] repo/gentoo:master commit in: sys-fs/bees/files/, sys-fs/bees/
@ 2023-07-10 3:53 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-07-10 3:53 UTC (permalink / raw
To: gentoo-commits
commit: 76545a0fd15d35ad830510b7f29a0ed1cc918b94
Author: Kai Krakow <kai <AT> kaishome <DOT> de>
AuthorDate: Sun Jul 9 10:40:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 03:52:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76545a0f
sys-fs/bees: Add memory fragmentation work-around
Signed-off-by: Kai Krakow <kai <AT> kaishome.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/bees/bees-9999.ebuild | 14 +++++++++
...le-Work-around-kernel-memory-fragmentatio.patch | 34 ++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 65c3cbecea85..1b164eb56b08 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~BTRFS_FS"
ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+PATCHES=(
+ "${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch"
+)
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != buildonly ]]; then
if kernel_is -lt 4 11; then
@@ -66,6 +70,16 @@ pkg_pretend() {
ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
ewarn
fi
+ if kernel_is -gt 5 15 106; then
+ if kernel_is -lt 6 3 10; then
+ ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+ ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+ ewarn "latency spikes. This version ships with a work-around at the cost of not"
+ ewarn "handling highly duplicated filesystems that well. More details:"
+ ewarn "https://github.com/Zygo/bees/issues/260"
+ ewarn
+ fi
+ fi
elog "Bees recommends running the latest current kernel for performance and"
elog "reliability reasons, see README.md."
diff --git a/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch b/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch
new file mode 100644
index 000000000000..0ceb5cbfc79e
--- /dev/null
+++ b/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch
@@ -0,0 +1,34 @@
+From 10c2006e627b5bda74f9f8aca1a574aa0e0e1eaa Mon Sep 17 00:00:00 2001
+From: Kai Krakow <kai@kaishome.de>
+Date: Sun, 9 Jul 2023 12:24:40 +0200
+Subject: [PATCH] HACK: crucible: Work around kernel memory fragmentation
+
+According to @Zygo:
+
+> This will drastically reduce the number of reflinks bees can handle
+> to a single extent, but that size is beyond more than enough for most
+> filesystems. Making the buffer smaller may also reduce the size of
+> vmallocs which might be aggravating the kernel's memory manager.
+
+Link: https://github.com/Zygo/bees/issues/260#issuecomment-1627586574
+Signed-off-by: Kai Krakow <kai@kaishome.de>
+---
+ include/crucible/fs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/crucible/fs.h b/include/crucible/fs.h
+index 6d1780b..5da7da0 100644
+--- a/include/crucible/fs.h
++++ b/include/crucible/fs.h
+@@ -65,7 +65,7 @@ namespace crucible {
+ };
+
+ struct BtrfsIoctlLogicalInoArgs {
+- BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 16 * 1024 * 1024);
++ BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 64 * 1024);
+
+ uint64_t get_flags() const;
+ void set_flags(uint64_t new_flags);
+--
+2.39.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/bees/files/, sys-fs/bees/
@ 2021-01-04 13:56 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-01-04 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 6ccc2794c5e7404fa15f6d36fe4f9ad4f355eb09
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Thu Dec 24 00:22:36 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 13:55:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ccc2794
sys-fs/bees: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/18587
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/bees/Manifest | 1 -
sys-fs/bees/bees-0.6.1-r2.ebuild | 99 ----------------------
...-local-lambda-expression-cannot-have-a-ca.patch | 38 ---------
...karound-to-prevent-LOGICAL_INO-and-btrfs-.patch | 95 ---------------------
...cess-Fix-gettid-ambiguity-with-glibc-2.30.patch | 97 ---------------------
5 files changed, 330 deletions(-)
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index c43cefc6e65..ebf679a1274 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1 @@
-DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.1-r2.ebuild
deleted file mode 100644
index 70bf39d08a6..00000000000
--- a/sys-fs/bees/bees-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/Zygo/bees.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="tools"
-
-DEPEND="
- >=sys-apps/util-linux-2.30.2
- >=sys-fs/btrfs-progs-4.20.2
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-PATCHES=(
- "${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
- "${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
- "${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
- "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if kernel_is -lt 4 4 3; then
- ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
- ewarn "properly operate, so it won't work. It's recommended to run at least"
- ewarn "kernel version 4.11 for best performance and reliability."
- ewarn
- elif kernel_is -lt 4 11; then
- ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
- ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
- ewarn "running, it's recommended to run at least kernel 4.11."
- ewarn
- elif kernel_is -lt 4 14 29; then
- ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
- ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
- ewarn "with more recent kernels:"
- ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
- ewarn
- fi
-
- if kernel_is -lt 5 3 4; then
- ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
- ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
- ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
- ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
- ewarn "the device RO without writing corrupted meta-data. More details:"
- ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
- ewarn
- fi
-
- if kernel_is -lt 5 0 4; then
- ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
- ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
- ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
- ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
- ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
- ewarn
- fi
-
- elog "Bees recommends running the latest current kernel for performance and"
- elog "reliability reasons, see README.md."
- fi
-}
-
-src_configure() {
- cat >localconf <<-EOF || die
- LIBEXEC_PREFIX=/usr/libexec
- PREFIX=/usr
- LIBDIR="$(get_libdir)"
- SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
- DEFAULT_MAKE_TARGET=all
- EOF
- if [[ ${PV} != "9999" ]] ; then
- cat >>localconf <<-EOF || die
- BEES_VERSION=v${PV}
- EOF
- fi
- if use tools; then
- echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
- fi
-}
diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
deleted file mode 100644
index 60ab748eb2b..00000000000
--- a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <zblaxell@thirteen.furryterror.org>
-Date: Wed, 12 Jun 2019 21:27:50 -0400
-Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a
- capture-default
-
-We got away with this because GCC 4.8 (and apparently every GCC prior
-to 9) didn't notice or care, and because there is nothing referenced
-inside the lambda function body that isn't accessible from any other
-kind of function body (i.e. the capture wasn't needed at all).
-
-GCC 9 now enforces what the C++ standard said all along: there is
-no need to allow capture-default in this case, so it is not.
-
-Fix by removing the offending capture-default.
-
-Fixes: https://github.com/Zygo/bees/issues/112
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- lib/error.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/error.cc b/lib/error.cc
-index f2a6db0..1d16a0a 100644
---- a/lib/error.cc
-+++ b/lib/error.cc
-@@ -32,7 +32,7 @@ namespace crucible {
-
- // FIXME: could probably avoid some of these levels of indirection
- static
-- function<void(string s)> current_catch_explainer = [&](string s) {
-+ function<void(string s)> current_catch_explainer = [](string s) {
- cerr << s << endl;
- };
-
---
-2.23.0
-
diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
deleted file mode 100644
index 6d8d2ea530d..00000000000
--- a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 19 Nov 2019 16:01:31 -0500
-Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs
- balance from running concurrently
-
-This avoids some kernel bugs. One of them is fixed in 5.3.4 and later:
-
- efad8a853a "Btrfs: fix use-after-free when using the tree modification log"
-
-There are apparently others in current kernels, so for now just put bees
-on pause until the balance is done.
-
-At some point we may want to provide an option to disable this
-workaround; however, running bees and balance at the same time makes
-neither particularly fast, so maybe we'll just leave it this way.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- src/bees-context.cc | 31 +++++++++++++++++++++++++++++++
- src/bees.h | 4 ++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/src/bees-context.cc b/src/bees-context.cc
-index 4e0a43e..0665019 100644
---- a/src/bees-context.cc
-+++ b/src/bees-context.cc
-@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult()
- {
- }
-
-+void
-+BeesContext::wait_for_balance()
-+{
-+ Timer balance_timer;
-+ BEESNOTE("WORKAROUND: waiting for balance to stop");
-+ while (true) {
-+ btrfs_ioctl_balance_args args;
-+ memset_zero<btrfs_ioctl_balance_args>(&args);
-+ const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
-+ if (ret < 0) {
-+ // Either can't get balance status or not running, exit either way
-+ break;
-+ }
-+
-+ if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
-+ // Balance not running, doesn't matter if paused or cancelled
-+ break;
-+ }
-+
-+ BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
-+ sleep(BEES_BALANCE_POLL_INTERVAL);
-+ }
-+}
-+
- BeesResolveAddrResult
- BeesContext::resolve_addr_uncached(BeesAddress addr)
- {
- THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
- THROW_CHECK0(invalid_argument, !!root_fd());
-+
-+ // Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-+ // Apparently yes, and more than one.
-+ // Wait for the balance to finish before we run LOGICAL_INO
-+ wait_for_balance();
-+
-+ // Time how long this takes
- Timer resolve_timer;
-
- // There is no performance benefit if we restrict the buffer size.
-diff --git a/src/bees.h b/src/bees.h
-index da87d88..5c9375c 100644
---- a/src/bees.h
-+++ b/src/bees.h
-@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10;
- // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
- const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
-
-+// Wait this long for a balance to stop
-+const double BEES_BALANCE_POLL_INTERVAL = 60.0;
-+
- // Flags
- const int FLAGS_OPEN_COMMON = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
- const int FLAGS_OPEN_DIR = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
-@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
- void set_root_fd(Fd fd);
-
- BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
-+ void wait_for_balance();
-
- BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
- void rewrite_file_range(const BeesFileRange &bfr);
---
-2.23.0
-
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
deleted file mode 100644
index 9f53e5b37da..00000000000
--- a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 29 Oct 2019 23:34:36 -0400
-Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In version 2.30 glibc added it's own gettid() function. This resulted in
-"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
-now exists in both namespace crucible and std.
-
-For now, use explicit references to namespace crucible. This continues
-to work with new and old libc without having to test specific library
-versions.
-
-At some point, glibc gettid() will be deployed widely enough that we can
-remove the crucible version entirely.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- include/crucible/lockset.h | 4 ++--
- lib/chatter.cc | 4 ++--
- src/bees.cc | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
-index 856c55e..99500b7 100644
---- a/include/crucible/lockset.h
-+++ b/include/crucible/lockset.h
-@@ -117,7 +117,7 @@ namespace crucible {
- while (full() || locked(name)) {
- m_condvar.wait(lock);
- }
-- auto rv = m_set.insert(make_pair(name, gettid()));
-+ auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- THROW_CHECK0(runtime_error, rv.second);
- }
-
-@@ -129,7 +129,7 @@ namespace crucible {
- if (full() || locked(name)) {
- return false;
- }
-- auto rv = m_set.insert(make_pair(name, gettid()));
-+ auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- THROW_CHECK1(runtime_error, name, rv.second);
- return true;
- }
-diff --git a/lib/chatter.cc b/lib/chatter.cc
-index cbd5adb..e5a24f9 100644
---- a/lib/chatter.cc
-+++ b/lib/chatter.cc
-@@ -69,14 +69,14 @@ namespace crucible {
- DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", <m));
-
- header_stream << buf;
-- header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
-+ header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
- if (!m_name.empty()) {
- header_stream << " " << m_name;
- }
- } else {
- header_stream << "<" << m_loglevel << ">";
- header_stream << (m_name.empty() ? "thread" : m_name);
-- header_stream << "[" << gettid() << "]";
-+ header_stream << "[" << crucible::gettid() << "]";
- }
-
- header_stream << ": ";
-diff --git a/src/bees.cc b/src/bees.cc
-index 08c3fd7..aa55af0 100644
---- a/src/bees.cc
-+++ b/src/bees.cc
-@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
- tl_next = m_prev;
- unique_lock<mutex> lock(s_mutex);
- if (tl_next) {
-- s_status[gettid()] = tl_next;
-+ s_status[crucible::gettid()] = tl_next;
- } else {
-- s_status.erase(gettid());
-+ s_status.erase(crucible::gettid());
- }
- }
-
-@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
- m_prev = tl_next;
- tl_next = this;
- unique_lock<mutex> lock(s_mutex);
-- s_status[gettid()] = tl_next;
-+ s_status[crucible::gettid()] = tl_next;
- }
-
- void
---
-2.23.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/bees/files/, sys-fs/bees/
@ 2019-11-30 7:50 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2019-11-30 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 5edfb351c0192a34bbbbacd38a9c7fb7de1cf26d
Author: Kai Krakow <kai <AT> kaishome <DOT> de>
AuthorDate: Thu Nov 28 21:33:53 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 07:48:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edfb351
sys-fs/bees: Bump to v0.6.1-r2
Closes: https://bugs.gentoo.org/701422
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Kai Krakow <kai <AT> kaishome.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/bees/bees-0.6.1-r2.ebuild | 98 ++++++++++++++++++++++
...cess-Fix-gettid-ambiguity-with-glibc-2.30.patch | 97 +++++++++++++++++++++
2 files changed, 195 insertions(+)
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.1-r2.ebuild
new file mode 100644
index 00000000000..38c83939e49
--- /dev/null
+++ b/sys-fs/bees/bees-0.6.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="tools"
+
+DEPEND="
+ >=sys-apps/util-linux-2.30.2
+ >=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+PATCHES=(
+ "${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
+ "${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
+ "${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if kernel_is -lt 4 4 3; then
+ ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
+ ewarn "properly operate, so it won't work. It's recommended to run at least"
+ ewarn "kernel version 4.11 for best performance and reliability."
+ ewarn
+ elif kernel_is -lt 4 11; then
+ ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+ ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+ ewarn "running, it's recommended to run at least kernel 4.11."
+ ewarn
+ elif kernel_is -lt 4 14 29; then
+ ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+ ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+ ewarn "with more recent kernels:"
+ ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+ ewarn
+ fi
+
+ if kernel_is -lt 5 3 4; then
+ ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+ ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+ ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+ ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+ ewarn "the device RO without writing corrupted meta-data. More details:"
+ ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+ ewarn
+ fi
+
+ if kernel_is -lt 5 0 4; then
+ ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
+ ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+ ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+ ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+ ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+ ewarn
+ fi
+
+ elog "Bees recommends running the latest current kernel for performance and"
+ elog "reliability reasons, see README.md."
+ fi
+}
+
+src_configure() {
+ cat >localconf <<-EOF || die
+ LIBEXEC_PREFIX=/usr/libexec
+ PREFIX=/usr
+ LIBDIR="$(get_libdir)"
+ SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+ DEFAULT_MAKE_TARGET=all
+ EOF
+ if [[ ${PV} != "9999" ]] ; then
+ cat >>localconf <<-EOF || die
+ BEES_VERSION=v${PV}
+ EOF
+ fi
+ if use tools; then
+ echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
+ fi
+}
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
new file mode 100644
index 00000000000..9f53e5b37da
--- /dev/null
+++ b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
@@ -0,0 +1,97 @@
+From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
+From: Zygo Blaxell <bees@furryterror.org>
+Date: Tue, 29 Oct 2019 23:34:36 -0400
+Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In version 2.30 glibc added it's own gettid() function. This resulted in
+"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
+now exists in both namespace crucible and std.
+
+For now, use explicit references to namespace crucible. This continues
+to work with new and old libc without having to test specific library
+versions.
+
+At some point, glibc gettid() will be deployed widely enough that we can
+remove the crucible version entirely.
+
+Signed-off-by: Zygo Blaxell <bees@furryterror.org>
+---
+ include/crucible/lockset.h | 4 ++--
+ lib/chatter.cc | 4 ++--
+ src/bees.cc | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
+index 856c55e..99500b7 100644
+--- a/include/crucible/lockset.h
++++ b/include/crucible/lockset.h
+@@ -117,7 +117,7 @@ namespace crucible {
+ while (full() || locked(name)) {
+ m_condvar.wait(lock);
+ }
+- auto rv = m_set.insert(make_pair(name, gettid()));
++ auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+ THROW_CHECK0(runtime_error, rv.second);
+ }
+
+@@ -129,7 +129,7 @@ namespace crucible {
+ if (full() || locked(name)) {
+ return false;
+ }
+- auto rv = m_set.insert(make_pair(name, gettid()));
++ auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+ THROW_CHECK1(runtime_error, name, rv.second);
+ return true;
+ }
+diff --git a/lib/chatter.cc b/lib/chatter.cc
+index cbd5adb..e5a24f9 100644
+--- a/lib/chatter.cc
++++ b/lib/chatter.cc
+@@ -69,14 +69,14 @@ namespace crucible {
+ DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", <m));
+
+ header_stream << buf;
+- header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
++ header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
+ if (!m_name.empty()) {
+ header_stream << " " << m_name;
+ }
+ } else {
+ header_stream << "<" << m_loglevel << ">";
+ header_stream << (m_name.empty() ? "thread" : m_name);
+- header_stream << "[" << gettid() << "]";
++ header_stream << "[" << crucible::gettid() << "]";
+ }
+
+ header_stream << ": ";
+diff --git a/src/bees.cc b/src/bees.cc
+index 08c3fd7..aa55af0 100644
+--- a/src/bees.cc
++++ b/src/bees.cc
+@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
+ tl_next = m_prev;
+ unique_lock<mutex> lock(s_mutex);
+ if (tl_next) {
+- s_status[gettid()] = tl_next;
++ s_status[crucible::gettid()] = tl_next;
+ } else {
+- s_status.erase(gettid());
++ s_status.erase(crucible::gettid());
+ }
+ }
+
+@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
+ m_prev = tl_next;
+ tl_next = this;
+ unique_lock<mutex> lock(s_mutex);
+- s_status[gettid()] = tl_next;
++ s_status[crucible::gettid()] = tl_next;
+ }
+
+ void
+--
+2.23.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-10 3:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-10 3:53 [gentoo-commits] repo/gentoo:master commit in: sys-fs/bees/files/, sys-fs/bees/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-04 13:56 Joonas Niilola
2019-11-30 7:50 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox