Merge pull request #10690 from jjhursey/sm-node-rank

btl/sm: Use node rank instead of local rank for sm backing file

Author: gpaulsen

opal/mca/btl/sm/btl_sm_component.c

@@ -23,6 +23,7 @@
  *                         reserved.
  * Copyright (c) 2019-2021 Google, Inc. All rights reserved.
  * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2022      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -367,9 +368,11 @@ mca_btl_sm_component_init(int *num_btls, bool enable_progress_threads, bool enab
 
     char *sm_file;
 
+    // Note: Use the node_rank not the local_rank for the backing file.
+    // This makes the file unique even when recovering from failures.
     rc = opal_asprintf(&sm_file, "%s" OPAL_PATH_SEP "sm_segment.%s.%u.%x.%d",
                        mca_btl_sm_component.backing_directory, opal_process_info.nodename,
-                           geteuid(), OPAL_PROC_MY_NAME.jobid, MCA_BTL_SM_LOCAL_RANK);
+                       geteuid(), OPAL_PROC_MY_NAME.jobid, opal_process_info.my_node_rank);
     if (0 > rc) {
         free(btls);
         return NULL;