diff --git a/pages/merlin6/announcements/downtimes.md b/pages/merlin6/announcements/downtimes.md index aeef106..72a26c3 100644 --- a/pages/merlin6/announcements/downtimes.md +++ b/pages/merlin6/announcements/downtimes.md @@ -12,9 +12,11 @@ On the first Monday of each month the Merlin6 cluster might be subject to interr Users will be informed with at least one week in advance when a downtime is scheduled for the next month. Downtimes will be informed to users through the mail list. Also, a detailed description -for the nexts scheduled interventions will be available in [Next Scheduled Downtimes](## Next Scheduled Downtimes)). +for the nexts scheduled interventions will be available in [Next Scheduled Downtimes](/merlin6/downtimes.html#next-scheduled-downtimes)). -### Scheduled Downtime Draining Policy +--- + +## Scheduled Downtime Draining Policy Scheduled downtimes mostly affecting the storage and Slurm configurantions may require draining the nodes. When this is required, users will be informed accordingly. Two different types of draining are possible: @@ -33,7 +35,7 @@ Unless explicitly specified, the default draining policy for each partition will 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. -#### Draining Policy Summary +### Draining Policy Summary The following table contains a summary of the draining policies during a Schedule Downtime: diff --git a/pages/merlin6/introduction.md b/pages/merlin6/introduction.md index d72c9f9..e3b443d 100644 --- a/pages/merlin6/introduction.md +++ b/pages/merlin6/introduction.md @@ -23,6 +23,16 @@ of GPU-based resources which are mostly used by the BIO experiments. --- -## Merlin6 +## Merlin6 Architecture -![Merlin6 Architecture]({{ "/images/merlinschema3.png" }}) \ No newline at end of file +### Merlin6 Cluster Architecture Diagram + +The following image shows the Merlin6 cluster architecture diagram: + +![Merlin6 Architecture Diagram]({{ "/images/merlinschema3.png" }}) + +### Merlin5 + Merlin6 Slurm Cluster Architecture Design + +The following image show the Slurm architecture design for the Merlin5 & Merlin6 clusters: + +![Merlin6 Slurm Architecture Design]({{ "/images/merlin-slurm-architecture.png" }})