Attachment #271 for ticket #316

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

(-)a/NEWS (+3 lines)
47	-- launch/poe - Fix for hostlist file support with repeated host names.	47	-- launch/poe - Fix for hostlist file support with repeated host names.
48	-- priority/multifactor2 - Prevent possible divide by zero.	48	-- priority/multifactor2 - Prevent possible divide by zero.
49	-- srun - Don't check for executable if --test-only flag is used.	49	-- srun - Don't check for executable if --test-only flag is used.
		50	-- energy - On a single node only use the last task for gathering energy.
		51	Since we don't currently track energy usage per task (only per step).
		52	Otherwise we get double the energy.
50		53
51	* Changes in Slurm 2.5.6	54	* Changes in Slurm 2.5.6
52	========================	55	========================




		if (jobacct) {
			jobacctinfo_setinfo(jobacct,
					    JOBACCT_DATA_RUSAGE, &rusage);
			/* Since we currently don't track energy
			   usage per task (only per step).  We take
			   into account only the last poll of the last task.
			   Odds are it is the only one with
			   information anyway, but just to be safe we
			   will zero out the previous value since this
			   one will over ride it.
			   If this ever changes in the future this logic
			   will need to change.
			*/
			if (jobacct->energy.consumed_energy)
				job->jobacct->energy.consumed_energy = 0;
			jobacctinfo_aggregate(job->jobacct, jobacct);
			jobacctinfo_destroy(jobacct);
		}

Return to ticket 316

Lines 1688-1693 _wait_for_any_task(slurmd_job_t *job, bool waitflag) Link Here

(-)a/src/slurmd/slurmstepd/mgr.c (+12 lines)
1688	if (jobacct) {	1688	if (jobacct) {
1689	jobacctinfo_setinfo(jobacct,	1689	jobacctinfo_setinfo(jobacct,
1690	JOBACCT_DATA_RUSAGE, &rusage);	1690	JOBACCT_DATA_RUSAGE, &rusage);
		1691	/* Since we currently don't track energy
		1692	usage per task (only per step). We take
		1693	into account only the last poll of the last task.
		1694	Odds are it is the only one with
		1695	information anyway, but just to be safe we
		1696	will zero out the previous value since this
		1697	one will over ride it.
		1698	If this ever changes in the future this logic
		1699	will need to change.
		1700	*/
		1701	if (jobacct->energy.consumed_energy)
		1702	job->jobacct->energy.consumed_energy = 0;
1691	jobacctinfo_aggregate(job->jobacct, jobacct);	1703	jobacctinfo_aggregate(job->jobacct, jobacct);
1692	jobacctinfo_destroy(jobacct);	1704	jobacctinfo_destroy(jobacct);
1693	}	1705	}