Merge pull request #7451 from rhc54/topic/slurm

rhc54 · web-flow · commit b1fff49f5028 · 2020-02-21T16:55:49.000-08:00
Fix Slurm process name
diff --git a/opal/mca/pmix/base/pmix_base_fns.c b/opal/mca/pmix/base/pmix_base_fns.c
@@ -145,6 +145,7 @@ int opal_pmix_convert_nspace(opal_jobid_t *jobid, pmix_nspace_t nspace)
         }
         /* if we get here, we don't know this nspace */
         OPAL_HASH_STR(nspace, jid);
+        jid &= ~(0x8000);
         *jobid = jid;
         nptr = OBJ_NEW(opal_nptr_t);
         nptr->jobid = jid;

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ int opal_pmix_convert_nspace(opal_jobid_t *jobid, pmix_nspace_t nspace)`
`145`	`145`	`}`
`146`	`146`	`/* if we get here, we don't know this nspace */`
`147`	`147`	`OPAL_HASH_STR(nspace, jid);`
	`148`	`+ jid &= ~(0x8000);`
`148`	`149`	`*jobid = jid;`
`149`	`150`	`nptr = OBJ_NEW(opal_nptr_t);`
`150`	`151`	`nptr->jobid = jid;`