Skip to content
Snippets Groups Projects
Commit f178f3a5 authored by Moe Jette's avatar Moe Jette
Browse files

Remove reference to "gold" in slurm.conf man page.

Minor cosmetic stuff in select/cons_res
parent 7826ec8b
No related branches found
No related tags found
No related merge requests found
...@@ -82,16 +82,11 @@ Also see \fBDefaultStoragePort\fR. ...@@ -82,16 +82,11 @@ Also see \fBDefaultStoragePort\fR.
\fBAccountingStorageType\fR \fBAccountingStorageType\fR
Define the accounting storage mechanism type. Define the accounting storage mechanism type.
Acceptable values at present include Acceptable values at present include
"accounting_storage/filetxt", "accounting_storage/gold",
"accounting_storage/mysql", "accounting_storage/none", "accounting_storage/mysql", "accounting_storage/none",
"accounting_storage/pgsql", and "accounting_storage/slurmdbd". "accounting_storage/pgsql", and "accounting_storage/slurmdbd".
The value "accounting_storage/filetxt" indicates that accounting records The value "accounting_storage/filetxt" indicates that accounting records
will be written to a the file specified by the will be written to a the file specified by the
\fBAccountingStorageLoc\fR parameter. \fBAccountingStorageLoc\fR parameter.
The value "accounting_storage/gold" indicates that account records
will be written to Gold
(http://www.clusterresources.com/pages/products/gold-allocation-manager.php),
which maintains its own database.
The value "accounting_storage/mysql" indicates that accounting records The value "accounting_storage/mysql" indicates that accounting records
should be written to a MySQL database specified by the should be written to a MySQL database specified by the
\fBAccountingStorageLoc\fR parameter. \fBAccountingStorageLoc\fR parameter.
...@@ -311,12 +306,8 @@ Also see \fBAccountingStoragePort\fR and \fBJobCompPort\fR. ...@@ -311,12 +306,8 @@ Also see \fBAccountingStoragePort\fR and \fBJobCompPort\fR.
\fBDefaultStorageType\fR \fBDefaultStorageType\fR
Define the accounting and job completion storage mechanism type. Define the accounting and job completion storage mechanism type.
Acceptable values at present include Acceptable values at present include
"filetxt", "gold", "mysql", "none", "pgsql", and "slurmdbd". "filetxt", "mysql", "none", "pgsql", and "slurmdbd".
The value "filetxt" indicates that records will be written to a the file. The value "filetxt" indicates that records will be written to a the file.
The value "gold" indicates that records will be written to Gold
(http://www.clusterresources.com/pages/products/gold-allocation-manager.php),
.na
which maintains its own database.
.ad .ad
The value "mysql" indicates that accounting records will be written to The value "mysql" indicates that accounting records will be written to
a mysql database. a mysql database.
......
...@@ -1476,7 +1476,7 @@ static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map, ...@@ -1476,7 +1476,7 @@ static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map,
} }
/* NOTE: num_procs is 1 by default, /* NOTE: num_procs is 1 by default,
* only reset max_nodes if user explicitly sets a proc count */ * Only reset max_nodes if user explicitly sets a proc count */
if ((job_ptr->num_procs > 1) && (max_nodes > job_ptr->num_procs)) if ((job_ptr->num_procs > 1) && (max_nodes > job_ptr->num_procs))
max_nodes = job_ptr->num_procs; max_nodes = job_ptr->num_procs;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment