Merge pull request #2870 from rhc54/cmr20x/qrsh

hppritcha · web-flow · commit afa3361fa792 · 2017-02-06T15:23:11.000-05:00
Minor change to allow qrsh to tree spawn, if supported
diff --git a/orte/mca/plm/rsh/plm_rsh_component.c b/orte/mca/plm/rsh/plm_rsh_component.c
@@ -17,7 +17,7 @@
  *                         reserved.
  * Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011      IBM Corporation.  All rights reserved.
- * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -288,8 +288,6 @@ static int rsh_component_query(mca_base_module_t **module, int *priority)
             }
             mca_plm_rsh_component.agent = tmp;
             mca_plm_rsh_component.using_qrsh = true;
-            /* no tree spawn allowed under qrsh */
-            mca_plm_rsh_component.no_tree_spawn = true;
             goto success;
         } else if (!mca_plm_rsh_component.disable_llspawn &&
                    NULL != getenv("LOADL_STEP_ID")) {
@@ -448,4 +446,3 @@ static int rsh_launch_agent_lookup(const char *agent_list, char *path)
     }
     return ORTE_SUCCESS;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`* reserved.`
`18`	`18`	`* Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.`
`19`	`19`	`* Copyright (c) 2011 IBM Corporation. All rights reserved.`
`20`		`- * Copyright (c) 2015 Intel, Inc. All rights reserved.`
	`20`	`+ * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.`
`21`	`21`	`* $COPYRIGHT$`
`22`	`22`	`*`
`23`	`23`	`* Additional copyrights may follow`
`@@ -288,8 +288,6 @@ static int rsh_component_query(mca_base_module_t *module, int priority)`
`288`	`288`	`}`
`289`	`289`	`mca_plm_rsh_component.agent = tmp;`
`290`	`290`	`mca_plm_rsh_component.using_qrsh = true;`
`291`		`- /* no tree spawn allowed under qrsh */`
`292`		`- mca_plm_rsh_component.no_tree_spawn = true;`
`293`	`291`	`goto success;`
`294`	`292`	`} else if (!mca_plm_rsh_component.disable_llspawn &&`
`295`	`293`	`NULL != getenv("LOADL_STEP_ID")) {`
`@@ -448,4 +446,3 @@ static int rsh_launch_agent_lookup(const char agent_list, char path)`
`448`	`446`	`}`
`449`	`447`	`return ORTE_SUCCESS;`
`450`	`448`	`}`
`451`		`-`