From 3ea2483315d07c51557471b013edb736cb19bdb1 Mon Sep 17 00:00:00 2001 From: Matt Ezell Date: Thu, 2 Nov 2017 13:48:46 -0400 Subject: [PATCH] Disable the LSF plm if CSM is detected LSF running on top of CSM does not provide LSF daemons on the compute nodes. Signed-off-by: Matt Ezell (cherry picked from commit e45761d49875a692e15a66a2ec2d4a133b71b700) Signed-off-by: Joshua Hursey --- orte/mca/plm/lsf/plm_lsf_component.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index 7e0a21bce55..c28e661d076 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -104,8 +104,8 @@ static int plm_lsf_close(void) static int orte_plm_lsf_component_query(mca_base_module_t **module, int *priority) { - /* check if lsf is running here */ - if (NULL == getenv("LSB_JOBID") || lsb_init("ORTE launcher") < 0) { + /* check if lsf is running here and make sure IBM CSM is NOT enabled */ + if (NULL == getenv("LSB_JOBID") || getenv("CSM_ALLOCATION_ID") || lsb_init("ORTE launcher") < 0) { /* nope, not here */ opal_output_verbose(10, orte_plm_base_framework.framework_output, "plm:lsf: NOT available for selection");