diff --git a/doc/html/tres.shtml b/doc/html/tres.shtml index 0563f5e4c0fd48f12f415237d42c81cbf97c8a56..0c5347d7e36b151fb60685ceebdd7fea60330ac3 100644 --- a/doc/html/tres.shtml +++ b/doc/html/tres.shtml @@ -44,16 +44,16 @@ Current TRES Types are: <ul> <li><b>AccountingStorageTRES</b> <p>Used to define which TRES are - to be tracked on the system. By default Billing, CPU, Energy, Memory and Node - are tracked. This will be the case whether specified or not. The - following example: + to be tracked on the system. By default Billing, CPU, Energy, Memory, Node, + FS/Disk, Pages and VMem are tracked. These default TRES cannot be disabled, + but only appended to. The following example: </p> <pre>AccountingStorageTRES=gres/craynetwork,license/iop1,bb/cray</pre> <p> - will track billing, cpu, energy, memory and nodes along with a GRES called - craynetwork as well as a license called iop1. It will also track usage on a - Cray burst buffer. Whenever these resources are used on the - cluster they are recorded. TRES are automatically set up in the database + will track billing, cpu, energy, memory, nodes, fs/disk, pages and vmem along + with a GRES called craynetwork as well as a license called iop1. It will + also track usage on a Cray burst buffer. Whenever these resources are used on + the cluster they are recorded. TRES are automatically set up in the database on the start of the slurmctld. </p> diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 693ad386bba9527aed8e90c91ba3ea4c049d5a37..14c684bcaaacfefada016365238ff45f244336d2 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -121,13 +121,13 @@ Also see \fBDefaultStoragePort\fR. \fBAccountingStorageTRES\fR Comma separated list of resources you wish to track on the cluster. These are the resources requested by the sbatch/srun job when it -is submitted. Currently this consists of any GRES, BB (burst buffer) or +is submitted. Currently this consists of any GRES, BB (burst buffer) or license along with CPU, Memory, Node, Energy, FS/[Disk|Lustre], IC/OFED, Pages, and VMem. By default Billing, CPU, Energy, Memory, Node, FS/Disk, Pages and VMem -are tracked. +are tracked. These default TRES cannot be disabled, but only appended to. AccountingStorageTRES=gres/craynetwork,license/iop1 -will track billing, cpu, energy, memory, nodes, FS/disk along with a -gres called craynetwork as well as a license called iop1. Whenever these +will track billing, cpu, energy, memory, nodes, fs/disk, pages and vmem along +with a gres called craynetwork as well as a license called iop1. Whenever these resources are used on the cluster they are recorded. The TRES are automatically set up in the database on the start of the slurmctld.