diff --git a/pages/merlin6/announcements/downtimes.md b/pages/merlin6/announcements/downtimes.md index a72877d..adc062b 100644 --- a/pages/merlin6/announcements/downtimes.md +++ b/pages/merlin6/announcements/downtimes.md @@ -28,9 +28,10 @@ but jobs already queued on the partition may be allocated to nodes and run. Unless explicitly specified, the default draining policy for each partition will be the following: -* The **general** and **gpu_general** partitions will be soft drained on the previous Friday from 8am. -* The **daily** and **gpu_daily** partitions will be soft drained on the previous day from 8am. -* The **hourly** and **gpu_hourly** partitions will be soft drained on the same Monday from 7am. +* The **general** partition will be soft drained on the previous Friday from 8am. +* The **daily** partition will be soft drained on the previous day from 8am. +* The **hourly** partition will be soft drained on the same Monday from 7am. +* The **gpu** partition will be soft drained on the same Monday from 7am. Finally, **remaining running jobs will be killed** by default when the downtime starts. In some specific rare cases jobs will be just *paused* and *resumed* back when the downtime finished. @@ -42,11 +43,9 @@ The following table contains a summary of the draining policies during a Schedul | **Partition** | **Drain Policy** | **Default Drain Type** | **Default Job Policy** | |:---------------:| -----------------:| ----------------------:| --------------------------------:| | **general** | 72h before the SD | soft drain | Kill running jobs when SD starts | -| **gpu_general** | 72h before the SD | soft drain | Kill running jobs when SD starts | | **daily** | 24h before the SD | soft drain | Kill running jobs when SD starts | -| **gpu_daily** | 24h before the SD | soft drain | Kill running jobs when SD starts | | **hourly** | 1h before the SD | soft drain | Kill running jobs when SD starts | -| **gpu_hourly** | 1h before the SD | soft drain | Kill running jobs when SD starts | +| **gpu** | 72h before the SD | soft drain | Kill running jobs when SD starts | --- diff --git a/pages/merlin6/merlin6-slurm/running-jobs.md b/pages/merlin6/merlin6-slurm/running-jobs.md index 041f324..592c320 100644 --- a/pages/merlin6/merlin6-slurm/running-jobs.md +++ b/pages/merlin6/merlin6-slurm/running-jobs.md @@ -74,7 +74,7 @@ Use **man sbatch** (``man sbatch | grep -A36 '^filename pattern'``) for getting Merlin6 contains 6 partitions for general purpose: * For the CPU these are ``general``, ``daily`` and ``hourly``. - * For the GPU these are ``gpu_general``, ``gpu_daily`` and ``gpu_hourly``. + * For the GPU these are ``gpu``. If no partition is defined, ``general`` will be the default. Partition can be defined with the ``--partition`` option as follows: