Merge upstream/release/2.6 into upstream/google/2.6

debian/changelog

@@ -1,3 +1,9 @@
+daos (2.6.0-4) unstable; urgency=medium
+  [ Jerome Soumagne ]
+  * Bump mercury version to 2.4.0rc4
+
+ -- Jerome Soumagne <[email protected]>  Mon, 05 Aug 2024 12:00:00 -0500
+
 daos (2.6.0-3) unstable; urgency=medium
   [ Phillip Henderson ]
   * Third release candidate for 2.6.0

debian/control

@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 10),
                libopenmpi-dev,
                libssl-dev,
                libyaml-dev,
-               libmercury-dev (>= 2.3.1-1),
+               libmercury-dev (>= 2.4),
                scons,
                uuid-dev,
                pkg-config,

docs/release/release_notes.md

@@ -13,6 +13,7 @@ Architecture Support:
 * DAOS 2.6.0 supports the x86\_64 architecture.
 
 Operating System Support:
+
 * SLES/Leap 15 SP5
 * EL8.8/8.9 (RHEL, Rocky Linux, Alma Linux)
 * EL9.2 (RHEL, Rocky Linux, Alma Linux)

site_scons/components/__init__.py

@@ -127,7 +127,7 @@ def define_mercury(reqs):
         ofi_build.append('--disable-debug')
 
     reqs.define('ofi',
-                retriever=GitRepoRetriever('https://github.com/ofiwg/libfabric'),
+                retriever=GitRepoRetriever(),
                 commands=[['./autogen.sh'],
                           ofi_build,
                           ['make'],
@@ -152,7 +152,7 @@ def define_mercury(reqs):
         ucx_configure.extend(['--disable-debug', '--disable-logging'])
 
     reqs.define('ucx',
-                retriever=GitRepoRetriever('https://github.com/openucx/ucx.git'),
+                retriever=GitRepoRetriever(),
                 libs=['ucs', 'ucp', 'uct'],
                 functions={'ucs': ['ucs_debug_disable_signal']},
                 headers=['uct/api/uct.h'],
@@ -189,7 +189,7 @@ def define_mercury(reqs):
         mercury_build.append('-DMERCURY_ENABLE_DEBUG:BOOL=OFF')
 
     reqs.define('mercury',
-                retriever=GitRepoRetriever('https://github.com/mercury-hpc/mercury.git', True),
+                retriever=GitRepoRetriever(True),
                 commands=[mercury_build,
                           ['make'],
                           ['make', 'install']],
@@ -248,14 +248,14 @@ def define_components(reqs):
     define_ompi(reqs)
 
     reqs.define('isal',
-                retriever=GitRepoRetriever('https://github.com/intel/isa-l.git'),
+                retriever=GitRepoRetriever(),
                 commands=[['./autogen.sh'],
                           ['./configure', '--prefix=$ISAL_PREFIX', '--libdir=$ISAL_PREFIX/lib'],
                           ['make'],
                           ['make', 'install']],
                 libs=['isal'])
     reqs.define('isal_crypto',
-                retriever=GitRepoRetriever('https://github.com/intel/isa-l_crypto'),
+                retriever=GitRepoRetriever(),
                 commands=[['./autogen.sh'],
                           ['./configure',
                            '--prefix=$ISAL_CRYPTO_PREFIX',
@@ -265,7 +265,7 @@ def define_components(reqs):
                 libs=['isal_crypto'])
 
     reqs.define('pmdk',
-                retriever=GitRepoRetriever('https://github.com/pmem/pmdk.git'),
+                retriever=GitRepoRetriever(),
                 commands=[['make',
                            'all',
                            'NDCTL_ENABLE=n',
@@ -290,7 +290,7 @@ def define_components(reqs):
         abt_build.append('--enable-valgrind')
 
     reqs.define('argobots',
-                retriever=GitRepoRetriever('https://github.com/pmodels/argobots.git', True),
+                retriever=GitRepoRetriever(True),
                 commands=[['git', 'clean', '-dxf'],
                           ['./autogen.sh'],
                           abt_build,
@@ -301,7 +301,7 @@ def define_components(reqs):
                 headers=['abt.h'])
 
     reqs.define('fuse', libs=['fuse3'], defines=['FUSE_USE_VERSION=35'],
-                retriever=GitRepoRetriever('https://github.com/libfuse/libfuse.git'),
+                retriever=GitRepoRetriever(),
                 commands=[['meson', 'setup', '--prefix=$FUSE_PREFIX', '-Ddisable-mtab=True',
                            '-Dudevrulesdir=$FUSE_PREFIX/udev', '-Dutils=False',
                            '--default-library', 'both', '../fuse'],
@@ -330,7 +330,7 @@ def define_components(reqs):
         spdk_arch = 'haswell'
 
     reqs.define('spdk',
-                retriever=GitRepoRetriever('https://github.com/spdk/spdk.git', True),
+                retriever=GitRepoRetriever(True),
                 commands=[['./configure',
                            '--prefix=$SPDK_PREFIX',
                            '--disable-tests',
@@ -359,7 +359,7 @@ def define_components(reqs):
                 patch_rpath=['lib', 'bin'])
 
     reqs.define('protobufc',
-                retriever=GitRepoRetriever('https://github.com/protobuf-c/protobuf-c.git'),
+                retriever=GitRepoRetriever(),
                 commands=[['./autogen.sh'],
                           ['./configure', '--prefix=$PROTOBUFC_PREFIX', '--disable-protoc'],
                           ['make'],

site_scons/prereq_tools/base.py

@@ -239,9 +239,9 @@ def default_libpath():
 class GitRepoRetriever():
     """Identify a git repository from which to download sources"""
 
-    def __init__(self, url, has_submodules=False, branch=None):
+    def __init__(self, has_submodules=False, branch=None):
 
-        self.url = url
+        self.url = None
         self.has_submodules = has_submodules
         self.branch = branch
         self.commit_sha = None
@@ -272,9 +272,10 @@ def _update_submodules(self, subdir):
             if not RUNNER.run_commands(commands, subdir=subdir):
                 raise DownloadFailure(self.url, subdir)
 
-    def get(self, subdir, **kw):
+    def get(self, subdir, repo, **kw):
         """Downloads sources from a git repository into subdir"""
         # Now checkout the commit_sha if specified
+        self.url = repo
         passed_commit_sha = kw.get("commit_sha", None)
         if passed_commit_sha is None:
             comp = os.path.basename(subdir)
@@ -1043,6 +1044,7 @@ def get(self):
             return
         branch = self.prereqs.get_config("branches", self.name)
         commit_sha = self.prereqs.get_config("commit_versions", self.name)
+        repo = self.prereqs.get_config("repos", self.name)
 
         if not self.retriever:
             print(f'Using installed version of {self.name}')
@@ -1055,7 +1057,7 @@ def get(self):
 
         print(f'Downloading source for {self.name}')
         patches = self._resolve_patches()
-        self.retriever.get(self.src_path, commit_sha=commit_sha,
+        self.retriever.get(self.src_path, repo, commit_sha=commit_sha,
                            patches=patches, branch=branch)
 
     def _has_missing_system_deps(self, env):

src/cart/crt_group.c

@@ -1648,7 +1648,7 @@ crt_hdlr_uri_lookup(crt_rpc_t *rpc_req)
 
 	if (rc != DER_SUCCESS)
 		D_INFO("uri lookup of (rank=%d:tag=%d) group=%s failed; rc=%d\n", ul_in->ul_rank,
-		       ul_in->ul_tag, grp_priv->gp_pub.cg_grpid, rc);
+		       ul_in->ul_tag, grp_priv == NULL ? "(null)" : grp_priv->gp_pub.cg_grpid, rc);
 
 	if (should_decref)
 		crt_grp_priv_decref(grp_priv);