From e8d19ee659c5182d89d3d2d9477a3a3de8af2ccf Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Mon, 12 Oct 2009 22:12:50 +0000
Subject: [PATCH] check in removal of select_g_job_list_test
---
src/common/node_select.c | 22 --
src/common/node_select.h | 14 -
src/plugins/sched/wiki2/job_will_run.c | 2 +-
.../select/bluegene/plugin/bg_job_place.c | 248 +-----------------
.../select/bluegene/plugin/bg_job_place.h | 6 +-
.../select/bluegene/plugin/select_bluegene.c | 20 +-
src/plugins/select/cons_res/select_cons_res.c | 17 --
src/plugins/select/linear/select_linear.c | 18 --
8 files changed, 13 insertions(+), 334 deletions(-)
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 02ae896e4c1..ac139b4ff45 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -85,7 +85,6 @@ typedef struct slurm_select_ops {
int mode,
List preeemptee_candidates,
List *preemptee_job_list);
- int (*job_list_test) (List req_list);
int (*job_begin) (struct job_record *job_ptr);
int (*job_ready) (struct job_record *job_ptr);
int (*job_fini) (struct job_record *job_ptr);
@@ -183,7 +182,6 @@ static slurm_select_ops_t * _select_get_ops(slurm_select_context_t *c)
"select_p_node_init",
"select_p_block_init",
"select_p_job_test",
- "select_p_job_list_test",
"select_p_job_begin",
"select_p_job_ready",
"select_p_job_fini",
@@ -658,26 +656,6 @@ extern int select_g_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
preemptee_job_list);
}
-/*
- * Given a list of select_will_run_t's in
- * accending priority order we will see if we can start and
- * finish all the jobs without increasing the start times of the
- * jobs specified and fill in the est_start of requests with no
- * est_start. If you are looking to see if one job will ever run
- * then use select_p_job_test instead.
- * IN/OUT req_list - list of select_will_run_t's in asscending
- * priority order on success of placement fill in
- * est_start of request with time.
- * RET zero on success, EINVAL otherwise
- */
-extern int select_g_job_list_test(List req_list)
-{
- if (slurm_select_init() < 0)
- return SLURM_ERROR;
-
- return (*(g_select_context->ops.job_list_test))(req_list);
-}
-
/*
* Note initiation of job is about to begin. Called immediately
* after select_g_job_test(). Executed from slurmctld.
diff --git a/src/common/node_select.h b/src/common/node_select.h
index 9d06f0f7911..3ab54e0eb43 100644
--- a/src/common/node_select.h
+++ b/src/common/node_select.h
@@ -205,20 +205,6 @@ extern int select_g_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
List preemptee_candidates,
List *preemptee_job_list);
-/*
- * Given a list of select_will_run_t's in
- * accending priority order we will see if we can start and
- * finish all the jobs without increasing the start times of the
- * jobs specified and fill in the est_start of requests with no
- * est_start. If you are looking to see if one job will ever run
- * then use select_p_job_test instead.
- * IN/OUT req_list - list of select_will_run_t's in asscending
- * priority order on success of placement fill in
- * est_start of request with time.
- * RET zero on success, EINVAL otherwise
- */
-extern int select_g_job_list_test(List req_list);
-
/*
* Note initiation of job is about to begin. Called immediately
* after select_g_job_test(). Executed from slurmctld.
diff --git a/src/plugins/sched/wiki2/job_will_run.c b/src/plugins/sched/wiki2/job_will_run.c
index 5258809a8a9..a14a25a6428 100644
--- a/src/plugins/sched/wiki2/job_will_run.c
+++ b/src/plugins/sched/wiki2/job_will_run.c
@@ -325,7 +325,7 @@ static char * _will_run_test(uint32_t *jobid, time_t *start_time,
if (preemptee_candidates)
list_destroy(preemptee_candidates);
} else {
- rc = select_g_job_list_test(select_list);
+ //rc = select_g_job_list_test(select_list);
}
if (rc == SLURM_SUCCESS) {
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index 5c9f35f5d1f..eb619892f54 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -58,7 +58,6 @@ _STMT_START { \
pthread_mutex_t create_dynamic_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t job_list_test_mutex = PTHREAD_MUTEX_INITIALIZER;
/* This list is for the test_job_list function because we will be
* adding and removing blocks off the bg_lists->job_running and don't want
@@ -1333,11 +1332,17 @@ static void _build_select_struct(struct job_record *job_ptr,
* IN mode - SELECT_MODE_RUN_NOW: try to schedule job now
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
+ * IN preemptee_candidates - List of pointers to jobs which can be preempted.
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
+ * if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* RET - SLURM_SUCCESS if job runnable now, error code otherwise
*/
extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
uint32_t min_nodes, uint32_t max_nodes,
- uint32_t req_nodes, int mode)
+ uint32_t req_nodes, int mode,
+ List preemptee_candidates,
+ List *preemptee_job_list)
{
int rc = SLURM_SUCCESS;
bg_record_t* bg_record = NULL;
@@ -1522,242 +1527,3 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
list_destroy(block_list);
return rc;
}
-
-extern int test_job_list(List req_list)
-{
- int rc = SLURM_SUCCESS;
- bg_record_t* bg_record = NULL;
- bg_record_t* new_record = NULL;
- char buf[100];
-// uint16_t tmp16 = (uint16_t)NO_VAL;
- List block_list = NULL;
- int blocks_added = 0;
- time_t starttime = time(NULL);
- ListIterator itr = NULL;
- select_will_run_t *will_run = NULL;
-
- slurm_mutex_lock(&job_list_test_mutex);
-
- if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
- slurm_mutex_lock(&create_dynamic_mutex);
-
- job_block_test_list = copy_bg_list(bg_lists->job_running);
-
- slurm_mutex_lock(&block_state_mutex);
- block_list = copy_bg_list(bg_lists->main);
- slurm_mutex_unlock(&block_state_mutex);
-
- itr = list_iterator_create(req_list);
- while((will_run = list_next(itr))) {
- uint16_t conn_type = (uint16_t)NO_VAL;
-
- if(!will_run->job_ptr) {
- error("test_job_list: you need to give me a job_ptr");
- rc = SLURM_ERROR;
- break;
- }
-
- select_g_select_jobinfo_get(will_run->job_ptr->select_jobinfo,
- SELECT_JOBDATA_CONN_TYPE, &conn_type);
- if(conn_type == SELECT_NAV) {
- if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
- conn_type = SELECT_SMALL;
- else if(will_run->min_nodes > 1)
- conn_type = SELECT_TORUS;
- else if(will_run->job_ptr->num_procs
- < bg_conf->procs_per_bp)
- conn_type = SELECT_SMALL;
-
- select_g_select_jobinfo_set(
- will_run->job_ptr->select_jobinfo,
- SELECT_JOBDATA_CONN_TYPE,
- &conn_type);
- }
- select_g_select_jobinfo_sprint(
- will_run->job_ptr->select_jobinfo,
- buf, sizeof(buf),
- SELECT_PRINT_MIXED);
- debug("bluegene:submit_job_list: %s nodes=%u-%u-%u",
- buf, will_run->min_nodes,
- will_run->req_nodes, will_run->max_nodes);
- list_sort(block_list, (ListCmpF)_bg_record_sort_aval_dec);
- rc = _find_best_block_match(block_list, &blocks_added,
- will_run->job_ptr,
- will_run->avail_nodes,
- will_run->min_nodes,
- will_run->max_nodes,
- will_run->req_nodes,
- &bg_record, true);
-
- if(rc == SLURM_SUCCESS) {
- if(bg_record) {
- /* Here we see if there is a job running since
- * some jobs take awhile to finish we need to
- * make sure the time of the end is in the
- * future. If it isn't (meaning it is in the
- * past or current time) we add 5 seconds to
- * it so we don't use the block immediately.
- */
- if(bg_record->job_ptr
- && bg_record->job_ptr->end_time) {
- if(bg_record->job_ptr->end_time <=
- starttime)
- starttime += 5;
- else {
- starttime = bg_record->
- job_ptr->end_time;
- }
- }
- bg_record->job_running =
- will_run->job_ptr->job_id;
- bg_record->job_ptr = will_run->job_ptr;
- debug2("test_job_list: "
- "can run job %u on found block at %d"
- "nodes = %s",
- bg_record->job_ptr->job_id,
- starttime,
- bg_record->nodes);
-
- if(!block_exist_in_list(job_block_test_list,
- bg_record)) {
- new_record =
- xmalloc(sizeof(bg_record_t));
- copy_bg_record(bg_record, new_record);
- list_append(job_block_test_list,
- new_record);
- }
-
- if(will_run->job_ptr->start_time) {
- if(will_run->job_ptr->start_time
- < starttime) {
- debug2("test_job_list: "
- "Time is later "
- "than one supplied.");
- rc = SLURM_ERROR;
- break;
- }
-
- //continue;
- } else
- will_run->job_ptr->start_time
- = starttime;
-
- if(will_run->job_ptr->time_limit != INFINITE
- && will_run->job_ptr->time_limit != NO_VAL)
- will_run->job_ptr->end_time =
- will_run->job_ptr->start_time +
- will_run->job_ptr->time_limit *
- 60;
- else if(will_run->job_ptr->part_ptr->max_time
- != INFINITE
- && will_run->job_ptr->
- part_ptr->max_time != NO_VAL)
- will_run->job_ptr->end_time =
- will_run->job_ptr->start_time +
- will_run->job_ptr->
- part_ptr->max_time * 60;
- else
- will_run->job_ptr->end_time =
- will_run->job_ptr->start_time +
- 31536000; // + year
-
- select_g_select_jobinfo_set(
- will_run->job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODES,
- bg_record->nodes);
- select_g_select_jobinfo_set(
- will_run->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
- bg_record->ionodes);
-
-/* if(!bg_record->bg_block_id) { */
-/* uint16_t geo[BA_SYSTEM_DIMENSIONS]; */
-
-/* debug2("test_job_list: " */
-/* "can start job at " */
-/* "%u on %s on unmade block", */
-/* starttime, */
-/* bg_record->nodes); */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_BLOCK_ID, */
-/* "unassigned"); */
-/* if(will_run->job_ptr->num_procs */
-/* < bg_conf->bp_node_cnt */
-/* && will_run->job_ptr->num_procs */
-/* > 0) { */
-/* i = bg_conf->procs_per_bp/ */
-/* will_run->job_ptr-> */
-/* num_procs; */
-/* debug2("divide by %d", i); */
-/* } else */
-/* i = 1; */
-/* will_run->min_nodes *= */
-/* bg_conf->bp_node_cnt/i; */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_NODE_CNT, */
-/* &will_run->min_nodes); */
-/* memset(geo, 0, */
-/* sizeof(uint16_t) */
-/* * BA_SYSTEM_DIMENSIONS); */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_GEOMETRY, */
-/* &geo); */
-/* } else { */
-/* if((bg_record->ionodes) */
-/* && (will_run->job_ptr->part_ptr-> */
-/* max_share */
-/* <= 1)) */
-/* error("Small block used in " */
-/* "non-shared partition"); */
-
-/* debug2("test_job_list: " */
-/* "can start job at %u on %s", */
-/* starttime, */
-/* bg_record->nodes); */
-
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_BLOCK_ID, */
-/* bg_record->bg_block_id); */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_NODE_CNT, */
-/* &bg_record->node_cnt); */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_GEOMETRY, */
-/* &bg_record->geo); */
-
-/* tmp16 = bg_record->conn_type; */
-/* select_g_select_jobinfo_set( */
-/* will_run->job_ptr-> */
-/* select_jobinfo, */
-/* SELECT_JOBDATA_CONN_TYPE, */
-/* &tmp16); */
-/* } */
- } else {
- error("we got a success, but no block back");
- rc = SLURM_ERROR;
- }
- }
- }
- list_iterator_destroy(itr);
-
- if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
- slurm_mutex_unlock(&create_dynamic_mutex);
-
- list_destroy(block_list);
- list_destroy(job_block_test_list);
-
- slurm_mutex_unlock(&job_list_test_mutex);
- return rc;
-}
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.h b/src/plugins/select/bluegene/plugin/bg_job_place.h
index a50a454c5ee..5e98fd0d15b 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.h
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.h
@@ -57,8 +57,8 @@
*/
extern int submit_job(struct job_record *job_ptr, bitstr_t *bitmap,
uint32_t min_nodes, uint32_t max_nodes,
- uint32_t req_nodes, int mode);
-
-extern int test_job_list(List req_list);
+ uint32_t req_nodes, int mode,
+ List preemptee_candidates,
+ List *preemptee_job_list);
#endif /* _BG_JOB_PLACE_H_ */
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index 9f300ee6ec1..3c43c43cd26 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -497,24 +497,8 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
*/
return submit_job(job_ptr, bitmap, min_nodes, max_nodes,
- req_nodes, mode);
-}
-
-/*
- * select_p_job_list_test - Given a list of select_will_run_t's in
- * accending priority order we will see if we can start and
- * finish all the jobs without increasing the start times of the
- * jobs specified and fill in the est_start of requests with no
- * est_start. If you are looking to see if one job will ever run
- * then use select_p_job_test instead.
- * IN/OUT req_list - list of select_will_run_t's in asscending
- * priority order on success of placement fill in
- * est_start of request with time.
- * RET zero on success, EINVAL otherwise
- */
-extern int select_p_job_list_test(List req_list)
-{
- return test_job_list(req_list);
+ req_nodes, mode, preemptee_candidates,
+ preemptee_job_list);
}
extern int select_p_job_begin(struct job_record *job_ptr)
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 1083b1b22dd..032d77aa3a0 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -1707,23 +1707,6 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t * bitmap,
return rc;
}
-/*
- * select_p_job_list_test - Given a list of select_will_run_t's in
- * accending priority order we will see if we can start and
- * finish all the jobs without increasing the start times of the
- * jobs specified and fill in the est_start of requests with no
- * est_start. If you are looking to see if one job will ever run
- * then use select_p_job_test instead.
- * IN/OUT req_list - list of select_will_run_t's in asscending
- * priority order on success of placement fill in
- * est_start of request with time.
- * RET zero on success, EINVAL otherwise
- */
-extern int select_p_job_list_test(List req_list)
-{
- /* not currently supported */
- return EINVAL;
-}
extern int select_p_job_begin(struct job_record *job_ptr)
{
return SLURM_SUCCESS;
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index d0b87424cad..77aba0fa256 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -2120,24 +2120,6 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
return rc;
}
-/*
- * select_p_job_list_test - Given a list of select_will_run_t's in
- * accending priority order we will see if we can start and
- * finish all the jobs without increasing the start times of the
- * jobs specified and fill in the est_start of requests with no
- * est_start. If you are looking to see if one job will ever run
- * then use select_p_job_test instead.
- * IN/OUT req_list - list of select_will_run_t's in asscending
- * priority order on success of placement fill in
- * est_start of request with time.
- * RET zero on success, EINVAL otherwise
- */
-extern int select_p_job_list_test(List req_list)
-{
- /* not currently supported */
- return EINVAL;
-}
-
extern int select_p_job_begin(struct job_record *job_ptr)
{
int rc = SLURM_SUCCESS;
--
GitLab