update documentation for slurmdbd.conf

doc/man/man5/slurmdbd.conf.5

-.TH "slurmdbd.conf" "5" "February 2009" "slurmdbd.conf 2.0" "Slurm configuration file"
+.TH "slurmdbd.conf" "19" "August 2010" "slurmdbd.conf 2.2" "Slurm configuration file"
 .SH "NAME"
 slurmdbd.conf \- Slurm Database Daemon (SlurmDBD) configuration file
 
@@ -23,23 +23,30 @@ The overall configuration parameters available include:
 
 .TP
 \fBArchiveDir\fR
-If ArchiveScript is not set the slurmdbd will generate a text file that can be
+If ArchiveScript is not set the slurmdbd will generate a file that can be
 read in anytime with sacctmgr load filename.  This directory is where the
-file will be placed archive has ran.  Default is /tmp.
+file will be placed archive has ran.  Default is /tmp.  The format for this
+files name is
+$ArchiveDir/$ClusterName_$ArchiveObject_archive_$BeginTimeStamp_$endTimeStamp
 
 .TP
 \fBArchiveEvents\fR
-Boolean, yes to archive event data, no other wise.  Default is no.
+When purging events also achive them.  Boolean, yes to archive event data,
+no other wise.  Default is no.
 
 .TP
 \fBArchiveJobs\fR
-Boolean, yes to archive job data, no other wise.  Default is no.
+When purging jobs also achive them.  Boolean, yes to archive job data,
+no other wise.  Default is no.
 
 .TP
 \fBArchiveScript\fR
-This script is executed periodically in order to transfer accounting
-records out of the database into an archive. The script is executed
-with a no arguments, The following environment variables are set.
+This script can be executed every time a rollup happens (every hour,
+day and month), depending on the Purge*After options.  This script is used
+to transfer accounting records out of the database into an archive.  It is
+used in place of the internal process used to acrhive objects.
+The script is executed with a no arguments, The following environment
+variables are set.
 .RS
 .TP
 \fBSLURM_ARCHIVE_EVENTS\fR
@@ -70,11 +77,13 @@ Time of last suspend start to archive.
 
 .TP
 \fBArchiveSteps\fR
-Boolean, yes to archive step data, no other wise.  Default is no.
+When purging steps also achive them.  Boolean, yes to archive step data,
+no other wise.  Default is no.
 
 .TP
 \fBArchiveSuspend\fR
-Boolean, yes to archive suspend data, no other wise.  Default is no.
+When purging suspend data also achive it.  Boolean, yes to archive
+suspend data, no other wise.  Default is no.
 
 .TP
 \fBAuthInfo\fR
@@ -358,7 +367,7 @@ StorageType=accounting_storage/mysql
 StorageUser=database_mgr
 
 .SH "COPYING"
-Copyright (C) 2008 Lawrence Livermore National Security.
+Copyright (C) 2008-2010 Lawrence Livermore National Security.
 Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP

src/plugins/accounting_storage/mysql/as_mysql_rollup.c

@@ -1023,7 +1023,7 @@ end_it:
 
 	/* go check to see if we archive and purge */
 
-	if( rc == SLURM_SUCCESS)
+	if(rc == SLURM_SUCCESS)
 		rc = _process_purge(mysql_conn, cluster_name, archive_data,
 				    SLURMDB_PURGE_HOURS);