Merge branch 'slurm-2.5'

Conflicts:
	doc/html/slurm_ug_registration.shtml

NEWS

@@ -106,6 +106,7 @@ documents those changes that are of interest to users and admins.
  -- Add missing symbols to the xlator.h
  -- Avoid placing pending jobs in AdminHold state due to backfill scheduler
     interactions with advanced reservation.
+ -- Accounting - make average by task not cpu.
 
 * Changes in Slurm 2.5.6
 ========================

doc/html/meetings.shtml

@@ -2,10 +2,13 @@
 
 <h1>Meetings</h1>
 
-<p><a href="slurm_ug_cfp.html"><b>SLURM User Group Meeting 2013</b></a><br>
+<p><b>SLURM User Group Meeting 2013</b><br>
 18-19 September 2013<br>
 Oakland, California, USA<br>
-Host: SchedMD</p>
+Host: SchedMD<br><br>
+<a href="slurm_ug_cfp.html">Call for Abstracts (Due 24 May)</a><br>
+<a href="slurm_ug_registration.html">Registration information</a>
+</p>
 
 <br>
 <h2>Past User Group Meetings</h2>
@@ -25,6 +28,6 @@ Host: Bull</p>
 Paris, France<br>
 Host: CEA</p>
 
-<p style="text-align:center;">Last modified 28 March 2013</p>
+<p style="text-align:center;">Last modified 29 April 2013</p>
 
 <!--#include virtual="footer.txt"-->

doc/html/priority_multifactor.shtml

@@ -128,10 +128,10 @@ priority of all the QOS's to become the QOS factor.</P>
 <a name=fairshare>
 <h2>Fair-share Factor</h2></a>
 
-<b>Note:</b> Computing the fair-share factor requires the installation
+<P><b>Note:</b> Computing the fair-share factor requires the installation
 and operation of the <a href="accounting.html">SLURM Accounting
 Database</a> to provide the assigned shares and the consumed,
-computing resources described below.
+computing resources described below.</P>
 
 <P> The fair-share component to a job's priority influences the order in which a user's queued jobs are scheduled to run based on the portion of the computing resources they have been allocated and the resources their jobs have already consumed.  The fair-share factor does not involve a fixed allotment, whereby a user's access to a machine is cut off once that allotment is reached.</P>
 

doc/html/slurm_ug_cfp.shtml

@@ -23,13 +23,13 @@ Slurm</a>, a highly scalable Resource Manager and Job Scheduler</li>
 or tutorial about Slurm is invited to send an abstract to
 <a href="mailto:sugc@schedmd.com">sugc@schedmd.com</a>.</p>
 
-<p>IMPORTANT DATES:<br>
+<p><b>Important Dates:</b><br>
 May 24, 2013: Abstracts due<br>
 June 21, 2013: Notification of acceptance<br>
 September 18-19, 2013: Slurm User Group Meeting 2013<br>
 </p>
 
-<p>Program Committee:<br>
+<p><b>Program Committee:</b><br>
 Yiannis Georgiou (Bull)<br>
 Matthieu Hautreux (CEA)<br>
 Morris Jette (SchedMD)<br>
@@ -37,4 +37,6 @@ Donald Lipari (LLNL, Lawrence Livermore National Laboratory)<br>
 Colin McMurtrie (CSCS, Swiss National Supercomputing Centre)<br>
 Stephen Trofinoff (CSCS, Swiss National Supercomputing Centre)</p>
 
+<p><a href="slurm_ug_registration.html">Registration information</a></p>
+
 <!--#include virtual="footer.txt"-->

doc/html/slurm_ug_registration.shtml

 <!--#include virtual="header.txt"-->
 
-<a href="http:///www.schedmd.com" target="_blank"><img src="schedmd.png" style="float: right;" border="0" width=220></a></p>
+<a href="http:///www.schedmd.com" target="_blank"><img src="schedmd.png" style="float: right;" border="0" width=200></a></p>
 <h1>Slurm User Group Meeting 2013</h1>
 <h2>Oakland, California, USA</h2>
 <h2>September 18-19, 2013</h2>
 <h2>Hosted by <a href="http://www.schedmd.com">SchedMD</a></h2>
 <br><br>
 <h2>Registration</h2>
-<p>The conference cost is TBD per person.
+<p>The conference cost is $250 per person for registrations by 29 August and
+$300 per person for late registration.
 This includes presentations, tutorials, lunch and snacks on both days,
-plus dinner on Wednesday evening.
-You must register by TBD using TBD.</p>
+plus dinner on Wednesday evening.<br><br>
+<a href="http://sug2013.eventbrite.com">Register here.</a></p>
 
 <h2>Meeting Information</h2>
 <p>The meeting will be held at
@@ -27,7 +28,8 @@ There is also frequent and free bus service to
 
 <h2>Hotel Information</h2>
 <p>Many hotel options are available in Oakland, San Fransisco, and elsewhere in
-the area. Consider the hotels listed below as suggestions:</p>
+the area. Just be sure that your hotel has easy access to BART.
+Consider the hotels listed below as suggestions:</p>
 
 <p><a href="http://www.marriott.com/hotels/travel/oakdt-oakland-marriott-city-center/">
 <b>Oakland Marriott City Center</b></a><br>
@@ -46,21 +48,25 @@ About 1 mile (2 km) from the conference center via the
 <a href="http://Bshuttle.com">Broadway Shuttle</a>.
 Ferry service to San Fransisco adjacent to the hotel.</p>
 
+<p><a href="http://www.marriott.com/hotels/travel/oakdt-oakland-marriott-city-center/">
+<b>Oakland Marriott City Center</b></a><br>
+Across the street from the conference center.
+Discounted rooms are available to government employees.</p>
+
 <h2>Preliminary Agenda</h2>
 <p><b>Tuesday 17 September</b><br>
-No-host dinner at
-<a href="http://www.lungomareoakland.com/">Lungomare Restaurant</a>, 
-at TBD for those interested.
+No-host dinner for those interested at
+<a href="http://www.lungomareoakland.com/">Lungomare Restaurant</a>, 7:00 PM.
 You must register separetely for this event at TBD.<p>
 
 <p><b>Wednesday 18 September</b><br>
-Meeting from 9AM to 5PM.<br>
+Meeting from 9:00 AM to 5:00 PM.<br>
 Dinner at TBD.
-There is an additional fee of TBD for guests and they must register in advance
+There is an additional fee of $50 for guests and they must register in advance
 at TBD.<p>
 
 <p><b>Thursday 19 September</b><br>
-Meeting from 9AM to 3PM.<p>
+Meeting from 9:00 AM to 3:00 PM.<p>
 
 <p>A complete agenda will be posted online when available.</p>
 

src/plugins/accounting_storage/mysql/as_mysql_job.c

@@ -952,7 +952,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
 {
 	time_t now;
 	int comp_status;
-	int cpus = 0;
+	int tasks = 0;
 	struct jobacctinfo *jobacct = (struct jobacctinfo *)step_ptr->jobacct;
 	struct jobacctinfo dummy_jobacct;
 	double ave_vsize = NO_VAL, ave_rss = NO_VAL, ave_pages = NO_VAL;
@@ -988,20 +988,20 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
 
 	if (slurmdbd_conf) {
 		now = step_ptr->job_ptr->end_time;
-		cpus = step_ptr->cpu_count;
+		tasks = step_ptr->job_ptr->details->num_tasks;
 	} else if (step_ptr->step_id == SLURM_BATCH_SCRIPT) {
 		now = time(NULL);
-		cpus = 1;
+		tasks = 1;
 	} else {
 		now = time(NULL);
 #ifdef HAVE_BG_L_P
 		/* Only L and P use this code */
-		cpus = step_ptr->job_ptr->details->min_cpus;
+		tasks = step_ptr->job_ptr->details->min_cpus;
 #else
 		if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
-			cpus = step_ptr->job_ptr->total_cpus;
+			tasks = step_ptr->job_ptr->total_cpus;
 		else
-			cpus = step_ptr->cpu_count;
+			tasks = step_ptr->step_layout->task_cnt;
 #endif
 	}
 
@@ -1016,15 +1016,15 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
 	}
 
 	/* figure out the ave of the totals sent */
-	if ((jobacct->min_cpu != NO_VAL) && cpus > 0) {
+	if ((jobacct->min_cpu != NO_VAL) && tasks > 0) {
 		ave_vsize = (double)jobacct->tot_vsize;
-		ave_vsize /= (double)cpus;
+		ave_vsize /= (double)tasks;
 		ave_rss = (double)jobacct->tot_rss;
-		ave_rss /= (double)cpus;
+		ave_rss /= (double)tasks;
 		ave_pages = (double)jobacct->tot_pages;
-		ave_pages /= (double)cpus;
+		ave_pages /= (double)tasks;
 		ave_cpu = (double)jobacct->tot_cpu;
-		ave_cpu /= (double)cpus;
+		ave_cpu /= (double)tasks;
 	}
 
 	if (!step_ptr->job_ptr->db_index) {