Skip to content
Snippets Groups Projects
Commit 7a187f10 authored by Morris Jette's avatar Morris Jette
Browse files

Expand backfill logging

Log more backfill scheduling actions including where/when jobs will run even if they can not start until long in the future
parent 92fb2a4b
No related branches found
No related tags found
No related merge requests found
...@@ -1082,12 +1082,12 @@ static int _attempt_backfill(void) ...@@ -1082,12 +1082,12 @@ static int _attempt_backfill(void)
acct_policy_alter_job(job_ptr, comp_time_limit); acct_policy_alter_job(job_ptr, comp_time_limit);
job_ptr->time_limit = comp_time_limit; job_ptr->time_limit = comp_time_limit;
job_ptr->end_time = job_ptr->start_time + job_ptr->end_time = job_ptr->start_time +
(job_ptr->time_limit * 60); (job_ptr->time_limit * 60);
} else { } else {
acct_policy_alter_job(job_ptr, orig_time_limit); acct_policy_alter_job(job_ptr, orig_time_limit);
job_ptr->time_limit = orig_time_limit; job_ptr->time_limit = orig_time_limit;
job_ptr->end_time = job_ptr->start_time + job_ptr->end_time = job_ptr->start_time +
(job_ptr->time_limit * 60); (job_ptr->time_limit * 60);
} }
if (rc == ESLURM_ACCOUNTING_POLICY) { if (rc == ESLURM_ACCOUNTING_POLICY) {
/* Unknown future start time, just skip job */ /* Unknown future start time, just skip job */
...@@ -1146,6 +1146,9 @@ static int _attempt_backfill(void) ...@@ -1146,6 +1146,9 @@ static int _attempt_backfill(void)
if (job_ptr->start_time > (sched_start + backfill_window)) { if (job_ptr->start_time > (sched_start + backfill_window)) {
/* Starts too far in the future to worry about */ /* Starts too far in the future to worry about */
if (debug_flags & DEBUG_FLAG_BACKFILL)
_dump_job_sched(job_ptr, end_reserve,
avail_bitmap);
continue; continue;
} }
...@@ -1171,12 +1174,12 @@ static int _attempt_backfill(void) ...@@ -1171,12 +1174,12 @@ static int _attempt_backfill(void)
/* /*
* Add reservation to scheduling table if appropriate * Add reservation to scheduling table if appropriate
*/ */
if (debug_flags & DEBUG_FLAG_BACKFILL)
_dump_job_sched(job_ptr, end_reserve, avail_bitmap);
if (qos_ptr && (qos_ptr->flags & QOS_FLAG_NO_RESERVE)) if (qos_ptr && (qos_ptr->flags & QOS_FLAG_NO_RESERVE))
continue; continue;
reject_array_job_id = 0; reject_array_job_id = 0;
reject_array_part = NULL; reject_array_part = NULL;
if (debug_flags & DEBUG_FLAG_BACKFILL)
_dump_job_sched(job_ptr, end_reserve, avail_bitmap);
bit_not(avail_bitmap); bit_not(avail_bitmap);
_add_reservation(start_time, end_reserve, _add_reservation(start_time, end_reserve,
avail_bitmap, node_space, &node_space_recs); avail_bitmap, node_space, &node_space_recs);
......
...@@ -586,10 +586,10 @@ extern int license_job_test(struct job_record *job_ptr, time_t when) ...@@ -586,10 +586,10 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
ListIterator iter; ListIterator iter;
licenses_t *license_entry, *match; licenses_t *license_entry, *match;
int rc = SLURM_SUCCESS, resv_licenses; int rc = SLURM_SUCCESS, resv_licenses;
info("license_job_test: p1");
if (!job_ptr->license_list) /* no licenses needed */ if (!job_ptr->license_list) /* no licenses needed */
return rc; return rc;
info("license_job_test: p2");
slurm_mutex_lock(&license_mutex); slurm_mutex_lock(&license_mutex);
iter = list_iterator_create(job_ptr->license_list); iter = list_iterator_create(job_ptr->license_list);
while ((license_entry = (licenses_t *) list_next(iter))) { while ((license_entry = (licenses_t *) list_next(iter))) {
...@@ -615,7 +615,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when) ...@@ -615,7 +615,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
when); when);
if ((license_entry->total + match->used + if ((license_entry->total + match->used +
resv_licenses) > match->total) { resv_licenses) > match->total) {
rc = EAGAIN; rc = EAGAIN;//SET HERE?
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment