Commit 77fcc6ca authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch...

Merge branch '327541-geo-docs-replace-node-with-site-in-replication-object_storage-md' into 'master'

Geo docs: replace node with site in replication/object_storage.md

See merge request gitlab-org/gitlab!59807
parents 8e4c9a82 66894cb2
...@@ -9,9 +9,9 @@ type: howto ...@@ -9,9 +9,9 @@ type: howto
Geo can be used in combination with Object Storage (AWS S3, or other compatible object storage). Geo can be used in combination with Object Storage (AWS S3, or other compatible object storage).
Currently, **secondary** nodes can use either: Currently, **secondary** sites can use either:
- The same storage bucket as the **primary** node. - The same storage bucket as the **primary** site.
- A replicated storage bucket. - A replicated storage bucket.
To have: To have:
...@@ -28,13 +28,13 @@ To have: ...@@ -28,13 +28,13 @@ To have:
WARNING: WARNING:
This is a [**beta** feature](https://about.gitlab.com/handbook/product/#beta) and is not ready yet for production use at any scale. The main limitations are a lack of testing at scale and no verification of any replicated data. This is a [**beta** feature](https://about.gitlab.com/handbook/product/#beta) and is not ready yet for production use at any scale. The main limitations are a lack of testing at scale and no verification of any replicated data.
**Secondary** nodes can replicate files stored on the **primary** node regardless of **Secondary** sites can replicate files stored on the **primary** site regardless of
whether they are stored on the local file system or in object storage. whether they are stored on the local file system or in object storage.
To enable GitLab replication, you must: To enable GitLab replication, you must:
1. Go to **Admin Area > Geo**. 1. Go to **Admin Area > Geo**.
1. Press **Edit** on the **secondary** node. 1. Press **Edit** on the **secondary** site.
1. In the **Synchronization Settings** section, find the **Allow this secondary node to replicate content on Object Storage** 1. In the **Synchronization Settings** section, find the **Allow this secondary node to replicate content on Object Storage**
checkbox to enable it. checkbox to enable it.
...@@ -46,7 +46,7 @@ For CI job artifacts, there is similar documentation to configure ...@@ -46,7 +46,7 @@ For CI job artifacts, there is similar documentation to configure
For user uploads, there is similar documentation to configure [upload object storage](../../uploads.md#using-object-storage) For user uploads, there is similar documentation to configure [upload object storage](../../uploads.md#using-object-storage)
If you want to migrate the **primary** node's files to object storage, you can If you want to migrate the **primary** site's files to object storage, you can
configure the **secondary** in a few ways: configure the **secondary** in a few ways:
- Use the exact same object storage. - Use the exact same object storage.
...@@ -57,15 +57,15 @@ configure the **secondary** in a few ways: ...@@ -57,15 +57,15 @@ configure the **secondary** in a few ways:
GitLab does not currently support the case where both: GitLab does not currently support the case where both:
- The **primary** node uses local storage. - The **primary** site uses local storage.
- A **secondary** node uses object storage. - A **secondary** site uses object storage.
## Third-party replication services ## Third-party replication services
When using Amazon S3, you can use When using Amazon S3, you can use
[CRR](https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) to [CRR](https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) to
have automatic replication between the bucket used by the **primary** node and have automatic replication between the bucket used by the **primary** site and
the bucket used by **secondary** nodes. the bucket used by **secondary** sites.
If you are using Google Cloud Storage, consider using If you are using Google Cloud Storage, consider using
[Multi-Regional Storage](https://cloud.google.com/storage/docs/storage-classes#multi-regional). [Multi-Regional Storage](https://cloud.google.com/storage/docs/storage-classes#multi-regional).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment