From 05f4deeb34b54311901f6abee2c722aa97f48900 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 21 Mar 2023 16:56:12 +0000 Subject: [PATCH] Merge pull request #12325 from overleaf/jpa-fix-shutdown-order [server-ce] fix shutdown sequence: flush document-updater before history GitOrigin-RevId: b46d25744cb18600e93b90e0ace5d4e1e563ebd2 --- server-ce/hotfix/3.5.5/Dockerfile | 7 +++++++ ...02_flush_document_updater => 01_flush_document_updater} | 0 .../{01_flush_project_history => 02_flush_project_history} | 0 .../{01_flush_track_changes => 02_flush_track_changes} | 0 4 files changed, 7 insertions(+) create mode 100644 server-ce/hotfix/3.5.5/Dockerfile rename server-ce/init_preshutdown_scripts/{02_flush_document_updater => 01_flush_document_updater} (100%) rename server-ce/init_preshutdown_scripts/{01_flush_project_history => 02_flush_project_history} (100%) rename server-ce/init_preshutdown_scripts/{01_flush_track_changes => 02_flush_track_changes} (100%) diff --git a/server-ce/hotfix/3.5.5/Dockerfile b/server-ce/hotfix/3.5.5/Dockerfile new file mode 100644 index 0000000000..558ec0f43f --- /dev/null +++ b/server-ce/hotfix/3.5.5/Dockerfile @@ -0,0 +1,7 @@ +FROM sharelatex/sharelatex:3.5.4 + +# Patch: fix shutdown sequence: flush document-updater before history services. +RUN cd /etc/my_init.pre_shutdown.d \ +&& mv 02_flush_document_updater 01_flush_document_updater \ +&& mv 01_flush_project_history 02_flush_project_history \ +&& mv 01_flush_track_changes 02_flush_track_changes diff --git a/server-ce/init_preshutdown_scripts/02_flush_document_updater b/server-ce/init_preshutdown_scripts/01_flush_document_updater similarity index 100% rename from server-ce/init_preshutdown_scripts/02_flush_document_updater rename to server-ce/init_preshutdown_scripts/01_flush_document_updater diff --git a/server-ce/init_preshutdown_scripts/01_flush_project_history b/server-ce/init_preshutdown_scripts/02_flush_project_history similarity index 100% rename from server-ce/init_preshutdown_scripts/01_flush_project_history rename to server-ce/init_preshutdown_scripts/02_flush_project_history diff --git a/server-ce/init_preshutdown_scripts/01_flush_track_changes b/server-ce/init_preshutdown_scripts/02_flush_track_changes similarity index 100% rename from server-ce/init_preshutdown_scripts/01_flush_track_changes rename to server-ce/init_preshutdown_scripts/02_flush_track_changes