diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md index 71268e8e78e37575f6afc540876d0c8915d78f29..e6e1c7489ee24d37b4a2d889b445c14ec8a5634a 100644 --- a/doc/integration/advanced_search/elasticsearch.md +++ b/doc/integration/advanced_search/elasticsearch.md @@ -577,11 +577,16 @@ is recreated with the correct up-to-date schema. ### All migrations must be finished before doing a major upgrade -Before doing a major version GitLab upgrade, you should have completed all +Before upgrading to a major GitLab version, you must complete all migrations that exist up until the latest minor version before that major -version. If you have halted migrations, these need to be resolved and -[retried](#retry-a-halted-migration) before proceeding with a major version -upgrade. Read more about [upgrading to a new major version](../../update/index.md#upgrading-to-a-new-major-version). +version. You must also resolve and [retry any halted migrations](#retry-a-halted-migration) +before proceeding with a major version upgrade. For more information, see [Upgrading to a new major version](../../update/index.md#upgrading-to-a-new-major-version). + +Migrations that have been removed are +[marked as obsolete](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63001). +If you upgrade GitLab before all pending advanced search migrations are completed, +those migrations are made obsolete and cannot be executed. In this case, you must +[re-create your index from scratch](elasticsearch_troubleshooting.md#last-resort-to-recreate-an-index). ## GitLab advanced search Rake tasks diff --git a/doc/update/index.md b/doc/update/index.md index 67c17bef7fb531b2ef88e24f7f26ec4271865830..c5e40d59bbd551cdf09885b9da1d248924d1045f 100644 --- a/doc/update/index.md +++ b/doc/update/index.md @@ -140,6 +140,11 @@ To clean up the migration, upgrade to 15.1 or later. For other advanced search migrations stuck in pending, see [how to retry a halted migration](../integration/advanced_search/elasticsearch.md#retry-a-halted-migration). +If you upgrade GitLab before all pending advanced search migrations are completed, any pending migrations +that have been removed in the new version cannot be executed or retried. +In this case, you must +[re-create your index from scratch](../integration/advanced_search/elasticsearch_troubleshooting.md#last-resort-to-recreate-an-index). + ### What do you do for the error `Elasticsearch version not compatible` Confirm that your version of Elasticsearch or OpenSearch is [compatible with your version of GitLab](../integration/advanced_search/elasticsearch.md#version-requirements).