Merge branch 'master' into patch-1

ornladios · Feb 7, 2023 · 49e9da6 · 49e9da6
2 parents 480e5cf + 75688e1
commit 49e9da6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/source/adios2/toolkit/format/bp5/BP5Deserializer.cpp b/source/adios2/toolkit/format/bp5/BP5Deserializer.cpp
@@ -1801,6 +1801,11 @@ void *BP5Deserializer::GetMetadataBase(BP5VarRec *VarRec, size_t Step,
     MetaArrayRec *writer_meta_base = NULL;
     if (m_RandomAccessMode)
     {
+        if (Step >= m_ControlArray.size() ||
+            WriterRank >= m_ControlArray[Step].size())
+        {
+            return NULL; // we don't have this rank in this step
+        }
         ControlInfo *CI =
             m_ControlArray[Step][WriterRank]; // writer control array
         if (((*CI->MetaFieldOffset).size() <= VarRec->VarNum) ||

diff --git a/source/adios2/toolkit/sst/dp/rdma_dp.c b/source/adios2/toolkit/sst/dp/rdma_dp.c
@@ -293,6 +293,11 @@ static void init_fabric(struct fabric_state *fabric, struct _SstParams *Params,
         Svcs->verbose(CP_Stream, DPCriticalVerbose,
                       "accessing domain failed with %d (%s). This is fatal.\n",
                       result, fi_strerror(result));
+        fprintf(
+            stderr,
+            "SST RDMA Dataplane failure.  fi_domain() has failed, which may "
+            "mean that libfabric is defaulting to the wrong interface.  Check "
+            "your FABRIC_IFACE environment variable (or specify one).\n");
         return;
     }
     info->ep_attr->type = FI_EP_RDM;

diff --git a/source/utils/bpls/bpls.cpp b/source/utils/bpls/bpls.cpp
@@ -1534,7 +1534,8 @@ int doList(const char *path)
         printf("\nADIOS Open: read header info from %s\n", path);
 
     std::string tpl = helper::LowerCase(transport_params);
-    bool remoteFile = (tpl.find("awssdk") != std::string::npos);
+    bool remoteFile = (tpl.find("awssdk") != std::string::npos) ||
+                      (tpl.find("daos") != std::string::npos);
     if (remoteFile)
     {
         if (engine_name.empty())