Skip to content

Commit 261fea2

Browse files
committed
DAOS-18882 vos: avoid heap_curr_allocated underflow (#18103)
Update PMDK to incorporate the following fixes: - fix "The pool was not closed" message (no ADR failure) daos-stack/pmdk#36 - recalculate curr_allocated on underflow daos-stack/pmdk#37 Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com> Priority: 2 Allow-unstable-test: true Skip-func-hw-test-medium: false Skip-func-hw-test-large: false
1 parent 741ef04 commit 261fea2

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
daos (2.6.4-22) unstable; urgency=medium
2+
[ Tomasz Gromadzki ]
3+
* Bump PMDK (libpmemobj) version to 2.1.3-2
4+
5+
-- Tomasz Gromadzki <tomasz.gromadzki@hpe.com> Fri, 24 Apr 2026 12:00:00 +0100
6+
17
daos (2.6.4-21) unstable; urgency=medium
28
[ Dalton Bohning ]
39
* Bump version

utils/build.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc7566497
3030
fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff
3131
mercury=https://github.com/mercury-hpc/mercury/commit/0a7756d4ef2f329fa7caa8e4052a099a91816f2f.diff,https://github.com/mercury-hpc/mercury/commit/e9eff75beee31bce6e8d6ea6841652f453a26d71.diff,https://github.com/mercury-hpc/mercury/commit/be5f9eb8415e46cfe9e12dcf5b82db67fccb34d2.diff,https://github.com/mercury-hpc/mercury/commit/2b6ce8622706195a6d432b77ba9c5b7b013bea76.diff,https://github.com/mercury-hpc/mercury/commit/f62eeb5273f8cd47b9a0ca2e0bfd7c0e9518f0b8.diff
3232
argobots=https://github.com/pmodels/argobots/pull/397/commits/411e5b344642ebc82190fd8b125db512e5b449d1.diff,https://github.com/pmodels/argobots/commit/bb0c908abfac4bfe37852eee621930634183c6aa.diff
33+
pmdk=https://github.com/daos-stack/pmdk/commit/bb048d67ccd07609f86a5e8b3c6ad54414d593ee.diff

utils/rpms/daos.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
Name: daos
2525
Version: 2.6.4
26-
Release: 21%{?relval}%{?dist}
26+
Release: 22%{?relval}%{?dist}
2727
Summary: DAOS Storage Engine
2828

2929
License: BSD-2-Clause-Patent
@@ -58,7 +58,7 @@ BuildRequires: libjson-c-devel
5858
BuildRequires: boost-devel
5959
%endif
6060
%if %{with server}
61-
BuildRequires: libpmemobj-devel >= 2.1.3
61+
BuildRequires: libpmemobj-devel >= 2.1.3-2
6262
%endif
6363
%if (0%{?rhel} >= 8)
6464
BuildRequires: fuse3-devel >= 3
@@ -156,11 +156,11 @@ Requires: ndctl
156156
# needed to set PMem configuration goals in BIOS through control-plane
157157
%if (0%{?suse_version} >= 1500)
158158
Requires: ipmctl >= 03.00.00.0423
159-
Requires: libpmemobj1 >= 2.1.3
159+
Requires: libpmemobj1 >= 2.1.3-2
160160
Requires: libfabric1 >= %{libfabric_version}
161161
%else
162162
Requires: ipmctl >= 03.00.00.0468
163-
Requires: libpmemobj >= 2.1.3
163+
Requires: libpmemobj >= 2.1.3-2
164164
%endif
165165
Requires: libfabric >= %{libfabric_version}
166166
Requires: mercury-libfabric >= %{mercury_version}
@@ -635,6 +635,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
635635
# No files in a shim package
636636

637637
%changelog
638+
* Fri Apr 24 2026 Tomasz Gromadzki <tomasz.gromadzki@hpe.com> 2.6.4-22
639+
- Bump PMDK (libpmemobj) version to 2.1.3-2
640+
638641
* Mon Mar 23 2026 Dalton Bohning <dalton.bohning@hpe.com> 2.6.4-21
639642
- Bump version
640643

0 commit comments

Comments
 (0)