diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c index 092e1d8e6a97770208f8f5ec1190cf0d450bc396..da452813abe9a3b04de64955240ba025e4bd3213 100644 --- a/src/plugins/sched/backfill/backfill.c +++ b/src/plugins/sched/backfill/backfill.c @@ -1082,12 +1082,12 @@ static int _attempt_backfill(void) acct_policy_alter_job(job_ptr, comp_time_limit); job_ptr->time_limit = comp_time_limit; job_ptr->end_time = job_ptr->start_time + - (job_ptr->time_limit * 60); + (job_ptr->time_limit * 60); } else { acct_policy_alter_job(job_ptr, orig_time_limit); job_ptr->time_limit = orig_time_limit; job_ptr->end_time = job_ptr->start_time + - (job_ptr->time_limit * 60); + (job_ptr->time_limit * 60); } if (rc == ESLURM_ACCOUNTING_POLICY) { /* Unknown future start time, just skip job */ @@ -1146,6 +1146,9 @@ static int _attempt_backfill(void) if (job_ptr->start_time > (sched_start + backfill_window)) { /* 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; } @@ -1171,12 +1174,12 @@ static int _attempt_backfill(void) /* * 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)) continue; reject_array_job_id = 0; reject_array_part = NULL; - if (debug_flags & DEBUG_FLAG_BACKFILL) - _dump_job_sched(job_ptr, end_reserve, avail_bitmap); bit_not(avail_bitmap); _add_reservation(start_time, end_reserve, avail_bitmap, node_space, &node_space_recs); diff --git a/src/slurmctld/licenses.c b/src/slurmctld/licenses.c index aceed38c96e256fd54d001963a63b47808d014fd..67e2b02d24116a3e1691e5398dc7105358ba6319 100644 --- a/src/slurmctld/licenses.c +++ b/src/slurmctld/licenses.c @@ -586,10 +586,10 @@ extern int license_job_test(struct job_record *job_ptr, time_t when) ListIterator iter; licenses_t *license_entry, *match; int rc = SLURM_SUCCESS, resv_licenses; - +info("license_job_test: p1"); if (!job_ptr->license_list) /* no licenses needed */ return rc; - +info("license_job_test: p2"); slurm_mutex_lock(&license_mutex); iter = list_iterator_create(job_ptr->license_list); 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) when); if ((license_entry->total + match->used + resv_licenses) > match->total) { - rc = EAGAIN; + rc = EAGAIN;//SET HERE? break; } }