From 6f12bdcd170530d19e5c889aebc6e08de39a4db3 Mon Sep 17 00:00:00 2001 From: ralf401 Date: Wed, 22 Jul 2026 14:52:32 +0200 Subject: [PATCH] Fixes #872 - Add ES reindexing to Docker restore process --- .../backup-and-restore/docker-compose.rst | 24 +++++++++++-------- .../connect-configure-elasticsearch.rst | 1 - install/update.rst | 3 +++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/appendix/backup-and-restore/docker-compose.rst b/appendix/backup-and-restore/docker-compose.rst index a7fb9d39..41b8d88d 100644 --- a/appendix/backup-and-restore/docker-compose.rst +++ b/appendix/backup-and-restore/docker-compose.rst @@ -49,15 +49,19 @@ Restore built-in backup method. Don't provide the ``latest_zammad_*.gz`` files because they link to an unknown location for the restore process. #. Start the stack. The restore process is triggered in the ``zammad-backup`` - service if the ``restore`` directory is detected and the backup files are in place. - - .. hint:: - As a part of this process, the cache will be cleared and any pre-existing - Elasticsearch indexes will be dropped. - All other containers will be waiting for the restore to finish. When that is the case, - they will resume their normal operations, which includes an automatic Elasticsearch - reindexing (depending on the ENV variables). You can check the container logs for - details. - + service if the ``restore`` directory is detected and the backup files are in + place. As a part of this process, the Rails cache will be cleared. All other + containers wait for the restore to finish before they resume their normal + operations. #. After the restore process has finished, the ``restore`` directory got renamed. You can safely delete it now. +#. Rebuild the Elasticsearch index. You can use Zammad while the rebuild is + running, but search performance is degraded and some data may be temporarily + unavailable in search results. Use the command below for Docker Compose + deployments. When using GUIs like portainer, have a look at the + :ref:`docker-run-commands` section in + the installation documentation. + + .. include:: /install/update.rst + :start-after: **Docker Compose:** + :end-before: **Portainer:** diff --git a/install/elasticsearch/connect-configure-elasticsearch.rst b/install/elasticsearch/connect-configure-elasticsearch.rst index a6b82679..6a90951d 100644 --- a/install/elasticsearch/connect-configure-elasticsearch.rst +++ b/install/elasticsearch/connect-configure-elasticsearch.rst @@ -106,7 +106,6 @@ Build/rebuild the searchindex $ zammad run rake zammad:searchindex:rebuild[8] - Optional settings ----------------- diff --git a/install/update.rst b/install/update.rst index 8ea4d010..b8ee1891 100644 --- a/install/update.rst +++ b/install/update.rst @@ -216,6 +216,9 @@ using `Zammad hosting`_ for your and your customers' safety. Only needed if the release note tells you to rebuild the Elasticsearch index. + .. Rebuild commands used in appendix/backup-and-restore/docker-compose-rst + .. When changing, make sure to adjust the reference there as well + **Docker Compose:** Without specifying CPU cores: