Attachment #429 for ticket #445

Lines 6-11 documents those changes that are of interest to users and admins. Link Here

(-)a/NEWS (+2 lines)
6	-- Fixed sh5util to print its usage.	6	-- Fixed sh5util to print its usage.
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
		10	configured and slurm is reconfigured during one of the sleep cycles.
9		11
10	* Changes in Slurm 2.6.3	12	* Changes in Slurm 2.6.3
11	========================	13	========================




#include "src/common/macros.h"
#include "src/common/node_select.h"
#include "src/common/parse_time.h"
#include "src/common/read_config.h"
#include "src/common/slurm_accounting_storage.h"
#include "src/common/slurm_protocol_api.h"
#include "src/common/xmalloc.h"

	uint16_t *njobs = NULL;
	bool already_counted;
	uint32_t reject_array_job_id = 0;
	time_t config_update = slurmctld_conf.last_update;

	bf_last_yields = 0;
#ifdef HAVE_CRAY

				     "after testing %d jobs, %s",
				     job_test_count, TIME_STR);
			}
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
			    (slurmctld_conf.last_update != config_update)) {
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
					info("backfill: system state changed, "
					     "breaking out after testing %d "

				     "after testing %d jobs, %s",
				     job_test_count, TIME_STR);
			}
			if ((_yield_locks(yield_sleep) && !backfill_continue) ||
			    (slurmctld_conf.last_update != config_update)) {
				if (debug_flags & DEBUG_FLAG_BACKFILL) {
					info("backfill: system state changed, "
					     "breaking out after testing %d "
- 

Return to ticket 445

Lines 64-69 Link Here

(-)a/src/plugins/sched/backfill/backfill.c (-3 / +6 lines)
64	#include "src/common/macros.h"	64	#include "src/common/macros.h"
65	#include "src/common/node_select.h"	65	#include "src/common/node_select.h"
66	#include "src/common/parse_time.h"	66	#include "src/common/parse_time.h"
		67	#include "src/common/read_config.h"
67	#include "src/common/slurm_accounting_storage.h"	68	#include "src/common/slurm_accounting_storage.h"
68	#include "src/common/slurm_protocol_api.h"	69	#include "src/common/slurm_protocol_api.h"
69	#include "src/common/xmalloc.h"	70	#include "src/common/xmalloc.h"
Lines 562-567 static int _attempt_backfill(void) Link Here
562	uint16_t *njobs = NULL;	563	uint16_t *njobs = NULL;
563	bool already_counted;	564	bool already_counted;
564	uint32_t reject_array_job_id = 0;	565	uint32_t reject_array_job_id = 0;
		566	time_t config_update = slurmctld_conf.last_update;
565		567
566	bf_last_yields = 0;	568	bf_last_yields = 0;
567	#ifdef HAVE_CRAY	569	#ifdef HAVE_CRAY
Lines 646-652 static int _attempt_backfill(void) Link Here
646	"after testing %d jobs, %s",	648	"after testing %d jobs, %s",
647	job_test_count, TIME_STR);	649	job_test_count, TIME_STR);
648	}	650	}
649	if (_yield_locks(yield_sleep) && !backfill_continue) {	651	if ((_yield_locks(yield_sleep) && !backfill_continue) \|\|
		652	(slurmctld_conf.last_update != config_update)) {
650	if (debug_flags & DEBUG_FLAG_BACKFILL) {	653	if (debug_flags & DEBUG_FLAG_BACKFILL) {
651	info("backfill: system state changed, "	654	info("backfill: system state changed, "
652	"breaking out after testing %d "	655	"breaking out after testing %d "
Lines 817-823 static int _attempt_backfill(void) Link Here
817	"after testing %d jobs, %s",	820	"after testing %d jobs, %s",
818	job_test_count, TIME_STR);	821	job_test_count, TIME_STR);
819	}	822	}
820	if (_yield_locks(yield_sleep) && !backfill_continue) {	823	if ((_yield_locks(yield_sleep) && !backfill_continue) \|\|
		824	(slurmctld_conf.last_update != config_update)) {
821	if (debug_flags & DEBUG_FLAG_BACKFILL) {	825	if (debug_flags & DEBUG_FLAG_BACKFILL) {
822	info("backfill: system state changed, "	826	info("backfill: system state changed, "
823	"breaking out after testing %d "	827	"breaking out after testing %d "
824	-