Hi Thomas, could you help review this change as well? it backports the cherry-pick in upstream's squid branch to our own LTS squid-stable-9 branch.
On Wed Jan 14, 2026 at 4:47 PM CST, Kefu Chai wrote: > A regression was introduced in PR #62514 that added a `ceph_assert()` > statement which incorrectly assumes alloc_unit is always aligned. This > causes OSD crashes when the assertion fails. > > This cherry-pick removes the faulty assertion, resolving the crash while > maintaining correct functionality for both aligned and unaligned alloc_unit > values. > > Cherry-picked from: https://github.com/ceph/ceph/pull/63753 > > References: > - Upstream issue: https://tracker.ceph.com/issues/71534 > - Introduced by: https://github.com/ceph/ceph/pull/62514 > > Fixes: #7211 > > Signed-off-by: Kefu Chai <[email protected]> > --- > ...BlueFS-truncate-accept-wierd-alloc_u.patch | 41 +++++++++++++++++++ > patches/series | 1 + > 2 files changed, 42 insertions(+) > create mode 100644 > patches/0057-os-bluestore-In-BlueFS-truncate-accept-wierd-alloc_u.patch > > diff --git > a/patches/0057-os-bluestore-In-BlueFS-truncate-accept-wierd-alloc_u.patch > b/patches/0057-os-bluestore-In-BlueFS-truncate-accept-wierd-alloc_u.patch > new file mode 100644 > index 00000000000..aa2b961678e > --- /dev/null > +++ b/patches/0057-os-bluestore-In-BlueFS-truncate-accept-wierd-alloc_u.patch > @@ -0,0 +1,41 @@ > +From 9832d7666439903edd11a20b1c6ae20de66dd9e4 Mon Sep 17 00:00:00 2001 > +From: Adam Kupczyk <[email protected]> > +Date: Tue, 11 Mar 2025 10:52:15 +0000 > +Subject: [PATCH] os/bluestore: In BlueFS::truncate accept wierd alloc_unit > + > +The alignment of extents might not reflect current alloc_unit[bdev]. > +It might be caused be either fallback to alternate AU size for SLOW, > +or change of allocation unit in DB or WAL. > +In such cases, truncation just leaves extent untouched. > + > +Fixes: https://tracker.ceph.com/issues/71534 > + > +Signed-off-by: Adam Kupczyk <[email protected]> > +(cherry picked from commit 0da7a2a58c207b97c9bcf4a1dfcd9d09f0e9b954) > +--- > + src/os/bluestore/BlueFS.cc | 8 +++++--- > + 1 file changed, 5 insertions(+), 3 deletions(-) > + > +diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc > +index c4557501935..59cae8dcfc7 100644 > +--- a/src/os/bluestore/BlueFS.cc > ++++ b/src/os/bluestore/BlueFS.cc > +@@ -3867,10 +3867,12 @@ int BlueFS::truncate(FileWriter *h, uint64_t > offset)/*_WF_L*/ > + changed_extents = true; > + ++p; > + } else { > +- // cut_off > p->length means that we misaligned the extent > +- ceph_assert(cut_off == p->length); > ++ // Usually cut_off == p->length. > ++ // Case cut_off > p->length means that we misaligned the extent > ++ // or alloc size changed in the meantime. > ++ // In both cases just leave extent untouched. > + fnode.allocated = (offset - x_off) + p->length; > +- ++p; // leave extent untouched > ++ ++p; > + } > + while (p != fnode.extents.end()) { > + dirty.pending_release[p->bdev].insert(p->offset, p->length); > +-- > +2.47.3 > + > diff --git a/patches/series b/patches/series > index badc33a9969..b56286554fb 100644 > --- a/patches/series > +++ b/patches/series > @@ -54,3 +54,4 @@ > 0054-client-prohibit-unprivileged-users-from-setting-sgid.patch > 0055-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch > 0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch > +0057-os-bluestore-In-BlueFS-truncate-accept-wierd-alloc_u.patch _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
