Merge pull request #2340 from rhc54/topic/dvm

rhc54 · web-flow · commit 4c9f7af4cb07 · 2016-11-01T20:28:02.000-07:00
Fix the radix routed component to correctly handle connected tools - …
diff --git a/orte/mca/routed/radix/routed_radix.c b/orte/mca/routed/radix/routed_radix.c
@@ -264,6 +264,13 @@ static orte_process_name_t get_route(orte_process_name_t *target)
         }
     }
 
+    /* if the jobid is different than our own, then this the target
+     * is a tool and we should go direct */
+    if (ORTE_JOB_FAMILY(target->jobid) != ORTE_JOB_FAMILY(ORTE_PROC_MY_NAME->jobid)) {
+        ret = target;
+        goto found;
+    }
+
     daemon.jobid = ORTE_PROC_MY_NAME->jobid;
     /* find out what daemon hosts this proc */
     if (ORTE_VPID_INVALID == (daemon.vpid = orte_get_proc_daemon_vpid(target))) {

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,13 @@ static orte_process_name_t get_route(orte_process_name_t *target)`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
	`267`	`+ /* if the jobid is different than our own, then this the target`
	`268`	`+ * is a tool and we should go direct */`
	`269`	`+ if (ORTE_JOB_FAMILY(target->jobid) != ORTE_JOB_FAMILY(ORTE_PROC_MY_NAME->jobid)) {`
	`270`	`+ ret = target;`
	`271`	`+ goto found;`
	`272`	`+ }`
	`273`	`+`
`267`	`274`	`daemon.jobid = ORTE_PROC_MY_NAME->jobid;`
`268`	`275`	`/* find out what daemon hosts this proc */`
`269`	`276`	`if (ORTE_VPID_INVALID == (daemon.vpid = orte_get_proc_daemon_vpid(target))) {`