some changes after proofreading
All checks were successful
Build and Deploy Documentation / build-and-deploy (push) Successful in 6s

This commit is contained in:
feichtinger 2025-05-27 14:15:57 +02:00
parent 8c4dd96128
commit 7def9e7584

View File

@ -15,13 +15,15 @@ Welcome to the official documentation for migrating your data from **Merlin6** t
### 🧍 Phase 1: Users without Projects — **Deadline: July 1** ### 🧍 Phase 1: Users without Projects — **Deadline: July 1**
If you **do not belong to any Merlin project**, you must complete your migration **before July 1**. This includes: If you **do not belong to any Merlin project**, i.e for
* Users not in any group project (`/data/projects/general`) * Users not in any group project (`/data/projects/general`)
* Users not in BIO, MEG, Mu3e * Users not in BIO, MEG, Mu3e
* Users not part of PSI-owned private Merlin nodes (ASA, MEG, Mu3e) * Users not part of PSI-owned private Merlin nodes (ASA, MEG, Mu3e)
Users are responsible for initiating and completing the migration process. You must complete your migration **before July 1**. You just need to migrate your personal */data/user/$USER* and */home/psi/$USER* directories.
Users are responsible for initiating and completing the migration process as lined out below.
Contact the Merlin support team [merlin-admins@lists.psi.ch](mailto:merlin-admins@lists.psi.ch) if you need help. Contact the Merlin support team [merlin-admins@lists.psi.ch](mailto:merlin-admins@lists.psi.ch) if you need help.
> ⚠️ In this phase, **it's important that you don't belong to any project**. > ⚠️ In this phase, **it's important that you don't belong to any project**.
@ -35,7 +37,7 @@ For users in active projects:
* Migration will be **scheduled individually per project**. * Migration will be **scheduled individually per project**.
* Expect contact **before August 1**. * Expect contact **before August 1**.
> ⚠️ In this phase, **group owners and members will be also requested to be migrated.** > ⚠️ In this phase, **data and home directories of group owners and members will be also requested to be migrated in parallel.**
--- ---
@ -48,7 +50,7 @@ For users in active projects:
| merlin6 | /psi/home/`$USER` | /data/user/`$USER` | /data/project/ | /data/experiments | | merlin6 | /psi/home/`$USER` | /data/user/`$USER` | /data/project/ | /data/experiments |
| merlin7 | /data/user/`$USER` | /data/user/`$USER` | /data/project/ | /data/project/ | | merlin7 | /data/user/`$USER` | /data/user/`$USER` | /data/project/ | /data/project/ |
* The **home directory and user data directory have been merged** into `/data/user/$USER`. * The **home directory and user data directory have been merged** into the single new home directory`/data/user/$USER`.
* The **experiments directory has been integrated into `/data/project/`**: * The **experiments directory has been integrated into `/data/project/`**:
* `/data/project/general` contains general Merlin7 projects. * `/data/project/general` contains general Merlin7 projects.
@ -62,14 +64,14 @@ For users in active projects:
Before starting the migration, make sure you: Before starting the migration, make sure you:
* Are **registered on Merlin7**. * are **registered on Merlin7**.
* If not yet registered, please do so at: [https://i.psi.ch/6L8](https://i.psi.ch/6L8) * 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**. * **have cleaned up your data to reduce migration time and space usage**.
* Ensure your total usage on Merlin6 is **well below the 1TB quota**. Remember: * Ensure your total usage on Merlin6 is **well below the 1TB quota** (use the `merlin_quotas` command). Remember:
* **Merlin7 also has a 1TB quota**, and you might already have data there. * **Merlin7 also has a 1TB quota on your home directory**, and you might already have data there.
* If your usage exceeds this during the transfer, the process might fail. * If your usage exceeds this during the transfer, the process might fail.
#### Recommended Cleanup Actions #### Recommended Cleanup Actions
@ -79,12 +81,12 @@ Before starting the migration, make sure you:
* Delete or clean up unused `conda` or `virtualenv` Python environments: * Delete or clean up unused `conda` or `virtualenv` Python environments:
* These are often large and may not work as-is on Merlin7. * These are often large and may not work as-is on Merlin7.
* You can export your conda environments with: * You can export your conda environment description to a file with:
```bash ```bash
conda env export -n myenv > $HOME/myenv.yml conda env export -n myenv > $HOME/myenv.yml
``` ```
* Then recreate them later on Merlin7. * 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. > 🧹 You can always remove more old data **after** migration — it will be copied into `~/merlin6data` and `~/merlin6home` on Merlin7.
@ -107,7 +109,7 @@ This script will:
* `~/merlin6data` → copy of your old /data/user * `~/merlin6data` → copy of your old /data/user
* `~/merlin6home` → copy of your old home * `~/merlin6home` → copy of your old home
> ⚠️ **Important:** If `~/merlin6home` or `~/merlin6data` already exist, the script will exit. > ⚠️ **Important:** If `~/merlin6home` or `~/merlin6data` already exist on Merlin7, the script will exit.
> **Please remove them or contact support**. > **Please remove them or contact support**.
If there are issues, the script will: If there are issues, the script will: