From 350ef5dc12d9306dca89448b397fd7d022dd30b2 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 15 Aug 2011 15:34:05 -0700
Subject: [PATCH] BLUEGENE - updated to smap to compile correctly on real
bluegene systems.
---
NEWS | 1 +
src/smap/configure_functions.c | 56 ++++++++++++----------------------
2 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/NEWS b/NEWS
index 6ff56d3f68c..837dbea26f8 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ documents those changes that are of interest to users and admins.
-- Memory leak fixed for rolling up accounting with down clusters.
-- BGQ - fix issue where if first job step is the entire block and then the
next parallel step is ran on a sub block, SLURM won't over subscribe cnodes.
+ -- BLUEGENE - updated to smap to compile correctly on real bluegene systems.
* Changes in SLURM 2.3.0.rc1
============================
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index 0cb3f7338ad..2d8595f19a8 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -44,68 +44,50 @@
#include "src/common/xstring.h"
#include "src/plugins/select/bluegene/bg_read_config.h"
-/* These are here to avoid linking issues with the bridge for
- * unresolved symbols.
+/* These are here to avoid direct linking issues with the bluegene plugin.
*/
-time_t last_job_update;
-time_t last_bg_update;
-bg_config_t *bg_conf;
-bg_lists_t *bg_lists;
-pthread_mutex_t block_state_mutex = PTHREAD_MUTEX_INITIALIZER;
-int bg_recover = 1;
-int blocks_are_created = 0;
-bool have_db2 = false;
-int num_unused_cpus;
-
-extern int bridge_init(char *properties_file)
+
+extern int slurm_drain_nodes(char *node_list, char *reason, uint32_t reason_uid)
{
- return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
-extern int bridge_fini()
+extern int job_fail(uint32_t job_id)
{
- return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
-extern int bridge_get_size(int *size)
+extern int slurm_fail_job(uint32_t job_id)
{
- return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
-extern int bridge_setup_system()
+extern void lock_slurmctld(int lock_levels)
{
- return SLURM_ERROR;
}
-extern int bridge_free_bg(my_bluegene_t *bg)
+extern void unlock_slurmctld(int lock_levels)
{
- return SLURM_ERROR;
}
-extern int bridge_get_bg(my_bluegene_t **bg)
+extern int drain_nodes(char *nodes, char *reason, uint32_t reason_uid)
{
- return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
-#ifdef HAVE_BG_FILES
-extern int bridge_get_data(rm_element_t* element,
- enum rm_specification field, void *data)
+extern int job_requeue (uid_t uid, uint32_t job_id, slurm_fd_t conn_fd,
+ uint16_t protocol_version, bool preempt)
{
- return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
-#else
-extern int bridge_get_data(void* element,
- int field, void *data)
+
+extern struct job_record *find_job_record(uint32_t job_id)
{
- return SLURM_ERROR;
+ return NULL;
}
-#endif
-extern int add_bg_record(List records, List *used_nodes,
- select_ba_request_t *blockreq,
- bool no_check, bitoff_t io_start)
+extern void trigger_block_error(void)
{
- return SLURM_ERROR;
}
///////////////////////////////////////////////////////////////////////
--
GitLab