From 54bb851254364a940091744603a7923ae96e65e4 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 25 Mar 2009 16:49:51 +0000
Subject: [PATCH] fixes for running on a bluegene system
---
src/common/env.c | 3 ---
.../accounting_storage/mysql/accounting_storage_mysql.c | 6 +++---
src/slurmctld/job_scheduler.c | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/common/env.c b/src/common/env.c
index e768fdca6d1..0daeeec8ea9 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -828,9 +828,6 @@ void
env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
const job_desc_msg_t *desc)
{
-#ifdef HAVE_BG
- char *bgl_part_id = NULL;
-#endif
#ifdef HAVE_CRAY_XT
char *resv_id = NULL;
#endif
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index 226e50c8ec6..7ca7184c124 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -2583,8 +2583,8 @@ static int _get_db_index(MYSQL *db_conn,
user or not.
*/
static int _get_usage_for_list(mysql_conn_t *mysql_conn,
- slurmdbd_msg_type_t type, List object_list,
- time_t start, time_t end)
+ slurmdbd_msg_type_t type, List object_list,
+ time_t start, time_t end)
{
#ifdef HAVE_MYSQL
int rc = SLURM_SUCCESS;
@@ -10887,7 +10887,7 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
} else
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
- select_g_get_jobinfo(job_ptr->select_jobinfo,
+ select_g_get_jobinfo(step_ptr->job_ptr->select_jobinfo,
SELECT_DATA_NODE_CNT,
&nodes);
#else
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index c4981691a7d..51ffc79d820 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -1094,7 +1094,7 @@ static char **_build_env(struct job_record *job_ptr)
#ifdef HAVE_BG
select_g_get_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_BLOCK_ID, &name);
- setenvf(&env, "MPIRUN_PARTITION", "%s", name);
+ setenvf(&my_env, "MPIRUN_PARTITION", "%s", name);
#endif
setenvf(&my_env, "SLURM_JOB_ACCOUNT", "%s", job_ptr->account);
if (job_ptr->details) {
--
GitLab