From c48c86cc5af30e11ecb60ff7c2114767acbf760f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 18 Aug 2011 13:08:30 -0700
Subject: [PATCH] Fixes to smap to further work better when the slurmctld isn't
up.
---
src/smap/grid_functions.c | 5 +++++
src/smap/smap.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index 5e51f11d241..66746746078 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -183,6 +183,11 @@ extern void init_grid(node_info_msg_t *node_info_ptr)
smap_system_ptr->node_cnt *= dim_size[i];
smap_system_ptr->grid = xmalloc(sizeof(smap_node_t *) *
smap_system_ptr->node_cnt);
+ /* We need to make sure we set up the wires if we
+ don't have a node_info_ptr.
+ */
+ bg_configure_ba_setup_wires();
+
_internal_setup_grid(0, coords);
#endif
} else {
diff --git a/src/smap/smap.c b/src/smap/smap.c
index 8d86bebea7c..b2e0ef04fb9 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
break; /* just continue */
}
if (params.iterate == 0)
- _smap_exit(1); /* Calls exit(), no return */
+ exit(1);
sleep(10); /* keep trying to reconnect */
}
}
@@ -359,7 +359,7 @@ static void _smap_exit(int rc)
free_grid();
#ifdef HAVE_BG
- ba_fini();
+ bg_configure_ba_fini();
#endif
#endif
--
GitLab