From 58901741c9513a56c47898d4ecd04137861fbd9f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 26 May 2005 21:10:11 +0000
Subject: [PATCH] minor update. Always check to make sure the username is
added when the partition is ready.
---
src/plugins/select/bluegene/bgl_job_run.c | 1 +
src/plugins/select/bluegene/bluegene.c | 7 ++-----
src/plugins/select/bluegene/sfree.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/select/bluegene/bgl_job_run.c b/src/plugins/select/bluegene/bgl_job_run.c
index 27c7806c733..4c665f2c124 100644
--- a/src/plugins/select/bluegene/bgl_job_run.c
+++ b/src/plugins/select/bluegene/bgl_job_run.c
@@ -294,6 +294,7 @@ static void _start_agent(bgl_update_t *bgl_update_ptr)
}
list_iterator_destroy(itr);
+ /* wait for all necessary partitions to be freed */
while(num_part_to_free != num_part_freed)
usleep(1000);
if((rc = boot_part(bgl_record,
diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index 987d173fc75..1a29eeae956 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -447,11 +447,8 @@ extern void set_part_user(bgl_record_t *bgl_record)
bgl_record->bgl_part_id);
bgl_record->boot_state = 0;
bgl_record->boot_count = 0;
- if(strcmp(bgl_record->target_name,
- bgl_record->user_name))
- if(update_partition_user(bgl_record)
- == 1)
- last_bgl_update = time(NULL);
+ if(update_partition_user(bgl_record) == 1)
+ last_bgl_update = time(NULL);
if(bgl_record->target_name) {
xfree(bgl_record->target_name);
bgl_record->target_name =
diff --git a/src/plugins/select/bluegene/sfree.c b/src/plugins/select/bluegene/sfree.c
index 82a771586bf..30e24f79232 100644
--- a/src/plugins/select/bluegene/sfree.c
+++ b/src/plugins/select/bluegene/sfree.c
@@ -363,7 +363,7 @@ static void _term_jobs_on_part(char *bgl_part_id)
}
if(job_found == 0)
- info("No jobs on partition");
+ info("No jobs on partition %s", bgl_part_id);
not_removed:
if ((rc = rm_free_job_list(job_list)) != STATUS_OK)
--
GitLab