Skip to content

Commit

Permalink
DAOS-9376 ofi: update to 1.14.0 and apply workaround (daos-stack#7904)
Browse files Browse the repository at this point in the history
Upgrade from libfabric 1.14.0-rc3 to 1.14.0 GA.
Grab libfabric fix to store ibv_wr_opcode and reuse it
it in error cases in the verbs provider.
Move build.cfg to the official tag, the additional libfabric
patch will be added in a subsequent PR.

Signed-off-by: Johann Lombardi <[email protected]>
  • Loading branch information
johannlombardi authored Jan 18, 2022
1 parent 32443c1 commit 40b9ad7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.1.100-18) unstable; urgency=medium
[ Johann Lombardi ]
* Update libfabric to 1.14.0 GA and apply fix for DAOS-9376

-- Johann Lombardi <[email protected]> Mon, 17 Jan 2022 10:00:00 -0100

daos (2.1.100-17) unstable; urgency=medium
[ Alexander Oganezov ]
* Update to mercury v2.1.0-rc4-3 to pick fix for DAOS-9325 high cpu usage
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: daos-stack <[email protected]>
Build-Depends: debhelper (>= 10),
dh-python,
libcmocka-dev,
libfabric-dev (>= 1.14.0~rc3-2),
libfabric-dev (>= 1.14.0-1),
libhwloc-dev,
libopenmpi-dev,
libssl-dev,
Expand Down Expand Up @@ -147,7 +147,7 @@ Package: daos-client
Section: net
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin, libfabric (>= 1.14.0~rc3-2)
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin, libfabric (>= 1.14.0-1)
Description: The Distributed Asynchronous Object Storage (DAOS) is an open-source
software-defined object store designed from the ground up for
massively distributed Non Volatile Memory (NVM). DAOS takes advantage
Expand All @@ -166,7 +166,7 @@ Section: net
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin,
ipmctl (>02.00.00.3816), libfabric (>= 1.14.0~rc3-2)
ipmctl (>02.00.00.3816), libfabric (>= 1.14.0-1)
Description: The Distributed Asynchronous Object Storage (DAOS) is an open-source
software-defined object store designed from the ground up for
massively distributed Non Volatile Memory (NVM). DAOS takes advantage
Expand Down
4 changes: 2 additions & 2 deletions utils/build.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PMDK = 1.11.0
ISAL = v2.30.0
ISAL_CRYPTO = v2.23.0
SPDK = v21.07
OFI = v1.14.0rc3
OFI = v1.14.0
OPENPA = v1.0.4
MERCURY = v2.1.0rc4
PSM2 = PSM2_11.2.78
Expand All @@ -16,5 +16,5 @@ PROTOBUFC = v1.3.3
[patch_versions]
spdk=https://github.com/spdk/spdk/commit/690783a3ae82ebe58c00d643520a66103d66d540.diff,https://github.com/spdk/spdk/commit/65425be69a0882ac283fb489aa151d7df06c52ad.diff,https://raw.githubusercontent.com/daos-stack/spdk/master/0003-blob-chunk-clear-operations-in-IU-aligned-chunks.patch,https://github.com/spdk/spdk/commit/148a9ab0c06346f9fec109a1df00651c1f5a0499.diff,https://github.com/spdk/spdk/commit/086223c029389329b7a4f38ec0f9a30be83849bf.diff,https://github.com/spdk/spdk/commit/a827fd7eeca67209d4c0aaad9a3ed55692e7e36e.diff
pmdk=https://raw.githubusercontent.com/daos-stack/pmdk/master/DAOS_8273.patch
ofi=https://raw.githubusercontent.com/daos-stack/libfabric/master/daos-9173-ofi.patch
ofi=https://raw.githubusercontent.com/daos-stack/libfabric/master/daos-9173-ofi.patch,https://raw.githubusercontent.com/daos-stack/libfabric/master/daos-9376-ofi.patch
mercury=https://raw.githubusercontent.com/daos-stack/mercury/master/cpu_usage.patch
7 changes: 5 additions & 2 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%define sysctl_script_name 10-daos_server.conf

%global mercury_version 2.1.0~rc4-3%{?dist}
%global libfabric_version 1.14.0~rc3-2
%global libfabric_version 1.14.0-1
%global __python %{__python3}

%if (0%{?rhel} >= 8)
Expand All @@ -15,7 +15,7 @@

Name: daos
Version: 2.1.100
Release: 17%{?relval}%{?dist}
Release: 18%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -539,6 +539,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Mon Jan 17 2022 Johann Lombardi <[email protected]> 2.1.100-18
- Update libfabric to 1.14.0 GA and apply fix for DAOS-9376

* Thu Dec 23 2021 Alexander Oganezov <[email protected]> 2.1.100-17
- Update to v2.1.0-rc4-3 to pick fix for DAOS-9325 high cpu usage
- Change mercury pinning to be >= instead of strict =
Expand Down

0 comments on commit 40b9ad7

Please sign in to comment.