From 273b8e80e7d13884efd7cca6f69f75ad3d06650f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Mon, 1 Nov 2010 17:50:50 +0000
Subject: [PATCH] better setting of updated blocks/jobs also fixed bug where
block would never be freed in simulation mode
---
src/plugins/select/bluegene/plugin/bg_job_place.c | 4 +++-
src/plugins/select/bluegene/plugin/bluegene.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index af60341282a..2f3d263808c 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -1244,6 +1244,7 @@ static int _sync_block_lists(List full_list, List incomp_list)
new_record->bg_block_id,
(size_t)new_record);
list_append(incomp_list, new_record);
+ last_bg_update = time(NULL);
count++;
}
list_iterator_reset(itr2);
@@ -1637,7 +1638,7 @@ preempt:
job_ptr->job_state |=
JOB_CONFIGURING;
- last_job_update = time(NULL);
+ last_bg_update = time(NULL);
}
} else
set_select_jobinfo(
@@ -1678,6 +1679,7 @@ preempt:
}
blocks_added = 0;
}
+ last_job_update = time(NULL);
} else {
error("we got a success, but no block back");
}
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index e97aba05e99..cea7874cdbc 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -546,8 +546,8 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
}
}
#else
-// bg_record->state = RM_PARTITION_FREE;
- bg_record->state = RM_PARTITION_DEALLOCATING;
+ bg_record->state = RM_PARTITION_FREE;
+// bg_record->state = RM_PARTITION_DEALLOCATING;
#endif
}
--
GitLab