From 03a47091879c48c1fec38ed256c8630c0bcde33e Mon Sep 17 00:00:00 2001 From: caubet_m Date: Wed, 18 Jun 2025 15:33:16 +0200 Subject: [PATCH] Update docs --- .../99-support/migration-from-merlin6.md | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/pages/merlin7/99-support/migration-from-merlin6.md b/pages/merlin7/99-support/migration-from-merlin6.md index f37ceb1..3c24255 100644 --- a/pages/merlin7/99-support/migration-from-merlin6.md +++ b/pages/merlin7/99-support/migration-from-merlin6.md @@ -29,6 +29,9 @@ Contact the Merlin support team [merlin-admins@lists.psi.ch](mailto:merlin-admin > ⚠️ In this phase, **it's important that you don't belong to any project**. > Once the migration is finished, **access to Merlin6 will be no longer possible.** +Please refer to the [Phase 1: Step-by-Step Migration Instructions](/merlin7/migrating.html#phase-1-step-by-step-migration-instructions) section +for detailed information about user data migration. + ### Phase 2: Project Members and Owners — **Start Before August 1** For users in active projects: @@ -39,6 +42,9 @@ For users in active projects: > ⚠️ In this phase, **data and home directories of group owners and members will be also requested to be migrated in parallel.** +Please refer to the [Phase 2: Migration Instructions](/merlin7/migrating.html#phase-2-migration-instructions) section +for further information. + --- ## Directory Structure Changes @@ -58,9 +64,7 @@ For users in active projects: --- -## Step-by-Step Migration Instructions - -### 📋 Prerequisites and Preparation +## 📋 Prerequisites and Preparation Before starting the migration, make sure you: @@ -69,12 +73,12 @@ Before starting the migration, make sure you: * If not yet registered, please do so following [these instructions](../merlin7/request-account.html) * **have cleaned up your data to reduce migration time and space usage**. -* Ensure your total usage on Merlin6 is **well below the 1 TB quota** (use the `merlin_quotas` command). Remember: +* **For the user data migration**, ensure your total usage on Merlin6 (`/psi/home`+`/data/user`) is **well below the 1 TB quota** (use the `merlin_quotas` command). Remember: * **Merlin7 also has a 1 TB quota on your home directory**, and you might already have data there. * If your usage exceeds this during the transfer, the process might fail. -#### Recommended Cleanup Actions +### Recommended Cleanup Actions * Remove unused files and datasets. * Archive large, inactive data sets. @@ -88,11 +92,13 @@ Before starting the migration, make sure you: ``` * Then recreate them later on Merlin7 from these files. -> 🧹 You can always remove more old data **after** migration — it will be copied into `~/merlin6data` and `~/merlin6home` on Merlin7. +> 🧹 For the **user data**, you can always remove more old data **after** migration — it will be copied into `~/merlin6data` and `~/merlin6home` on Merlin7. --- -## Step 1: Run `merlin7_migration.setup` +## Phase 1: Step-by-Step Migration Instructions + +### Step 1: Run `merlin7_migration.setup` Log into any **Merlin6 login node** (`merlin-l-001.psi.ch`, `merlin-l-002.psi.ch`, `merlin-l-01.psi.ch`) and run: @@ -121,7 +127,7 @@ If you are stuck, email: [merlin-admins@lists.psi.ch](mailto:merlin-admins@lists --- -## Step 2: Run `merlin7_migration.start` +### Step 2: Run `merlin7_migration.start` After setup completes, start the migration by running: @@ -145,7 +151,7 @@ This script will: > ⚠️ **Once both transfers succeed, your access to Merlin6 will be revoked.** > Do **not** attempt to reconnect to Merlin6 after this. -### ❗ If Something Goes Wrong +#### ❗ If Something Goes Wrong If a problem occurs during the migration process: @@ -163,7 +169,7 @@ Once the problem is resolved, simply re-run the `merlin7_migration.start` script --- -## Step 3: Monitor Transfer Jobs +### Step 3: Monitor Transfer Jobs To monitor your transfer jobs, run: @@ -182,9 +188,9 @@ You can also check logs (as printed by the script) to verify job completion. --- -## Examples +### Examples -### Setup the Migration +#### Setup the Migration ```bash merlin7_migration.setup @@ -204,7 +210,7 @@ merlin7_migration.setup ✅ ~/merlin6home directory created. ``` -### Start the Migration +#### Start the Migration ```bash merlin7_migration.start @@ -239,7 +245,7 @@ Submitting transfer jobs to Slurm ✅ FINISHED - PLEASE CHECK JOB TRANSFER PROGRESS ``` -### Monitor Progress +#### Monitor Progress ```bash squeue -M merlin6 -u $USER -p xfer @@ -255,6 +261,15 @@ CLUSTER: merlin6 24688580 xfer DATA_MIG caubet_m R 0:22 1 merlin-c-017 ``` +--- + +## Phase 2: Migration Instructions + +Please refer to the [Prerequisites and Preparation](/merlin7/migrating.html#-prerequisites-and-preparation) section for initial setup steps. +Further instructions will be sent via email once the owning team is contacted by the Merlin administrators. + +--- + ## ⚠️ Common `rsync`/`fpsync` Migration Issues ### File Permission Denied