diff --git a/debian/changelog b/debian/changelog index c3db0d17db9..5260ed189dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +daos (2.3.100-14) unstable; urgency=medium + [ Jerome Soumagne ] + * Update to mercury 2.2.0rc6 + + -- Jerome Soumagne Mon, 27 Jun 2022 18:26:02 -0600 + daos (2.3.100-13) unstable; urgency=medium [ Jeff Olivier ] * Remove libdts.so, make it build time static diff --git a/debian/control b/debian/control index fb7b095218c..dcf2ef68a2a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 10), libopenmpi-dev, libssl-dev, libyaml-dev, - libmercury-dev (>= 2.1.0~rc4-8), + libmercury-dev (>= 2.2.0~rc6-1), scons, uuid-dev, pkg-config, diff --git a/site_scons/components/__init__.py b/site_scons/components/__init__.py index efbd6a0b408..ba3d909b095 100644 --- a/site_scons/components/__init__.py +++ b/site_scons/components/__init__.py @@ -232,12 +232,11 @@ def define_mercury(reqs): commands=[mercury_build, ['make'], ['make', 'install']], - libs=['mercury', 'na', 'mercury_util'], + libs=['mercury'], pkgconfig='mercury', requires=[atomic, 'boost', 'ofi', 'ucx'] + libs, out_of_src_build=True, - package='mercury-devel' if inst(reqs, 'mercury') else None, - patch_rpath=['lib']) + package='mercury-devel' if inst(reqs, 'mercury') else None) def define_common(reqs): diff --git a/src/cart/crt_hg.c b/src/cart/crt_hg.c index 75df6c421a1..653ddf5a626 100644 --- a/src/cart/crt_hg.c +++ b/src/cart/crt_hg.c @@ -9,7 +9,6 @@ #define D_LOGFAC DD_FAC(hg) #include "crt_internal.h" -#include "mercury_util.h" /* * na_dict table should be in the same order of enum crt_na_type, the last one @@ -496,7 +495,10 @@ crt_provider_ip_str_get(int provider) { struct crt_prov_gdata *prov_data = crt_get_prov_gdata(provider); - return prov_data->cpg_na_ofi_config.noc_ip_str; + if (provider == CRT_NA_OFI_CXI) + return NULL; + else + return prov_data->cpg_na_ofi_config.noc_ip_str; } static bool @@ -596,12 +598,21 @@ crt_get_info_string(int provider, char **string, int ctx_idx) /* TODO: for now pass same info for all providers including CXI */ if (crt_provider_is_contig_ep(provider) && start_port != -1) { - D_ASPRINTF(*string, "%s://%s/%s:%d", - provider_str, domain_str, ip_str, - start_port + ctx_idx); + if (ip_str == NULL) + D_ASPRINTF(*string, "%s://%s:%d", + provider_str, domain_str, + start_port + ctx_idx); + else + D_ASPRINTF(*string, "%s://%s/%s:%d", + provider_str, domain_str, ip_str, + start_port + ctx_idx); } else { - D_ASPRINTF(*string, "%s://%s/%s", - provider_str, domain_str, ip_str); + if (ip_str == NULL) + D_ASPRINTF(*string, "%s://%s", + provider_str, domain_str); + else + D_ASPRINTF(*string, "%s://%s/%s", + provider_str, domain_str, ip_str); } out: @@ -643,20 +654,17 @@ crt_hg_init(void) #define EXT_FAC DD_FAC(external) env = getenv("HG_LOG_SUBSYS"); - if (!env) - HG_Set_log_subsys("hg,na"); - - env = getenv("HG_LOG_LEVEL"); if (!env) { - HG_Set_log_level("warning"); - HG_Util_set_log_level("warning"); + env = getenv("HG_LOG_LEVEL"); + if (!env) + HG_Set_log_level("warning"); } /* import HG log */ - hg_log_set_func(crt_hg_log); - hg_log_set_stream_debug((FILE *)(intptr_t)(EXT_FAC | DLOG_DBG)); - hg_log_set_stream_warning((FILE *)(intptr_t)(EXT_FAC | DLOG_WARN)); - hg_log_set_stream_error((FILE *)(intptr_t)(EXT_FAC | DLOG_ERR)); + HG_Set_log_func(crt_hg_log); + HG_Set_log_stream("debug", (FILE *)(intptr_t)(EXT_FAC | DLOG_DBG)); + HG_Set_log_stream("warning", (FILE *)(intptr_t)(EXT_FAC | DLOG_WARN)); + HG_Set_log_stream("error", (FILE *)(intptr_t)(EXT_FAC | DLOG_ERR)); #undef EXT_FAC out: diff --git a/utils/build.config b/utils/build.config index e9043c650cb..f2f80f74f7c 100644 --- a/utils/build.config +++ b/utils/build.config @@ -9,7 +9,7 @@ ISAL_CRYPTO = v2.23.0 SPDK = v21.07 OFI = v1.15.1 OPENPA = v1.0.4 -MERCURY = v2.1.0rc4 +MERCURY = v2.2.0rc6 PSM2 = PSM2_11.2.78 PROTOBUFC = v1.3.3 UCX=v1.12.1 @@ -17,4 +17,3 @@ UCX=v1.12.1 [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,https://github.com/spdk/spdk/commit/038f5b2e1b07f840e610ca206902a90661c6a28f.diff,https://github.com/spdk/spdk/commit/6c3fdade83cdf48182b7c2c3561ca7dd269d5aa9.diff,https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/91aee82d74696bb70284c794db0b2b9aef4bb9ec.diff,dpdk^https://github.com/spdk/dpdk/commit/22e79be44fd5609b7f43236d8be9b68303e99e81.diff pmdk=https://raw.githubusercontent.com/daos-stack/pmdk/master/DAOS_8273.patch -mercury=https://raw.githubusercontent.com/daos-stack/mercury/master/cpu_usage.patch,https://raw.githubusercontent.com/daos-stack/mercury/master/cxi_provider_plus_daos_9561.patch,https://raw.githubusercontent.com/daos-stack/mercury/master/na_ucx_changes.patch diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index c3969dbd016..eed80c79f43 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -3,7 +3,7 @@ %define agent_svc_name daos_agent.service %define sysctl_script_name 10-daos_server.conf -%global mercury_version 2.1.0~rc4-9%{?dist} +%global mercury_version 2.2.0~rc6-1%{?dist} %global libfabric_version 1.15.1-1 %global __python %{__python3} @@ -15,7 +15,7 @@ Name: daos Version: 2.3.100 -Release: 13%{?relval}%{?dist} +Release: 14%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -562,6 +562,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Mon Jun 27 2022 Jerome Soumagne 2.3.100-14 +- Update to mercury 2.2.0rc6 + * Fri Jun 17 2022 Jeff Olivier 2.3.100-13 - Remove libdts.so, replace with build time static