View | Details | Raw Unified | Return to ticket 6837 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/plugins/sched/backfill/backfill.c (-3 / +12 lines)
Lines 1333-1339 static int _attempt_backfill(void) Link Here
1333
	uint32_t test_array_job_id = 0;
1333
	uint32_t test_array_job_id = 0;
1334
	uint32_t test_array_count = 0;
1334
	uint32_t test_array_count = 0;
1335
	uint32_t job_no_reserve;
1335
	uint32_t job_no_reserve;
1336
	bool resv_overlap = false;
1336
	bool is_job_array_head, resv_overlap = false;
1337
	uint8_t save_share_res = 0, save_whole_node = 0;
1337
	uint8_t save_share_res = 0, save_whole_node = 0;
1338
	int test_fini;
1338
	int test_fini;
1339
	int user_part_inx1 = -1, user_part_inx2 = -1;
1339
	int user_part_inx1 = -1, user_part_inx2 = -1;
Lines 1699-1704 static int _attempt_backfill(void) Link Here
1699
		orig_start_time = job_ptr->start_time;
1699
		orig_start_time = job_ptr->start_time;
1700
		orig_time_limit = job_ptr->time_limit;
1700
		orig_time_limit = job_ptr->time_limit;
1701
1701
1702
		if (job_ptr->array_recs && (job_ptr->array_task_id == NO_VAL))
1703
			is_job_array_head = true;
1704
		else
1705
			is_job_array_head = false;
1706
1702
next_task:
1707
next_task:
1703
		/*
1708
		/*
1704
		 * Save the current preemption state. Reset preemption state
1709
		 * Save the current preemption state. Reset preemption state
Lines 2444-2454 skip_start: Link Here
2444
					}
2449
					}
2445
					break;
2450
					break;
2446
				}
2451
				}
2447
				if (job_ptr->array_task_id != NO_VAL) {
2452
				if (is_job_array_head &&
2453
				    (job_ptr->array_task_id != NO_VAL)) {
2448
					/* Try starting next task of job array */
2454
					/* Try starting next task of job array */
2449
					job_ptr = find_job_record(job_ptr->
2455
					job_ptr = find_job_record(job_ptr->
2450
								  array_job_id);
2456
								  array_job_id);
2451
					if (job_ptr && IS_JOB_PENDING(job_ptr))
2457
					if (job_ptr &&
2458
					    IS_JOB_PENDING(job_ptr) &&
2459
					    (bb_g_job_test_stage_in(job_ptr,
2460
								   false) == 1))
2452
						goto next_task;
2461
						goto next_task;
2453
				}
2462
				}
2454
				continue;
2463
				continue;

Return to ticket 6837