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

Collapse All | Expand All

(-)a/NEWS (-1 / +2 lines)
Lines 7-13 documents those changes that are of interest to users and admins. Link Here
7
 -- Corrected commit f9a3c7e4e8ec.
7
 -- Corrected commit f9a3c7e4e8ec.
8
 -- Honor ntasks-per-node option with exclusive node allocations.
8
 -- Honor ntasks-per-node option with exclusive node allocations.
9
 -- sched/backfill - Prevent invalid memory reference if bf_continue option is
9
 -- sched/backfill - Prevent invalid memory reference if bf_continue option is
10
    configured and slurm is reconfigured during one of the sleep cycles.
10
    configured and slurm is reconfigured during one of the sleep cycles or if
11
    there are any changes to the partition configuration.
11
 -- Update man pages information about acct-freq and JobAcctGatherFrequency
12
 -- Update man pages information about acct-freq and JobAcctGatherFrequency
12
    to reflect only the latest supported format.
13
    to reflect only the latest supported format.
13
14
(-)a/src/plugins/sched/backfill/backfill.c (-3 / +5 lines)
Lines 564-569 static int _attempt_backfill(void) Link Here
564
	bool already_counted;
564
	bool already_counted;
565
	uint32_t reject_array_job_id = 0;
565
	uint32_t reject_array_job_id = 0;
566
	time_t config_update = slurmctld_conf.last_update;
566
	time_t config_update = slurmctld_conf.last_update;
567
	time_t part_update = last_part_update;
567
568
568
	bf_last_yields = 0;
569
	bf_last_yields = 0;
569
#ifdef HAVE_CRAY
570
#ifdef HAVE_CRAY
Lines 649-655 static int _attempt_backfill(void) Link Here
649
				     job_test_count, TIME_STR);
650
				     job_test_count, TIME_STR);
650
			}
651
			}
651
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
652
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
652
			    (slurmctld_conf.last_update != config_update)) {
653
			    (slurmctld_conf.last_update != config_update) ||
654
			    (last_part_update != part_update)) {
653
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
655
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
654
					info("backfill: system state changed, "
656
					info("backfill: system state changed, "
655
					     "breaking out after testing %d "
657
					     "breaking out after testing %d "
Lines 821-827 static int _attempt_backfill(void) Link Here
821
				     job_test_count, TIME_STR);
823
				     job_test_count, TIME_STR);
822
			}
824
			}
823
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
825
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
824
			    (slurmctld_conf.last_update != config_update)) {
826
			    (slurmctld_conf.last_update != config_update) ||
827
			    (last_part_update != part_update)) {
825
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
828
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
826
					info("backfill: system state changed, "
829
					info("backfill: system state changed, "
827
					     "breaking out after testing %d "
830
					     "breaking out after testing %d "
828
- 

Return to ticket 445