Do not recreate tables

ISISComputingGroup · Aug 28, 2024 · 68daa9b · 68daa9b
1 parent 23de320
commit 68daa9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py
@@ -295,6 +295,12 @@ def run_force_upgrade_mysql(self):
         """
         self._mysql_tasks.install_mysql(force=True)
 
+    def run_upgrade_mysql(self):
+        """:key
+        Do upgrade of mysql with no table recreate.
+        """
+        self._mysql_tasks.install_mysql(force=False)
+
     def run_update_calibrations_repository(self):
         """update_calibrations_repository"""
         self._server_tasks.update_calibrations_repository()
@@ -396,7 +402,11 @@ def run_vhd_post_install(self):
     ),
     "force_upgrade_mysql": (
         UpgradeInstrument.run_force_upgrade_mysql,
-        "upgrade mysql version to latest",
+        "upgrade mysql version to latest and recreate tables",
+    ),
+    "upgrade_mysql": (
+        UpgradeInstrument.run_upgrade_mysql,
+        "upgrade mysql version to latest but do not recreate tables",
     ),
     "update_calibrations_repository": (
         UpgradeInstrument.run_update_calibrations_repository,

diff --git a/installation_and_upgrade/summer_update.bat b/installation_and_upgrade/summer_update.bat
@@ -14,7 +14,7 @@ IF %errorlevel% neq 0 (
 xcopy /y  %SOURCE%\15.0.0\EPICS\utils\logrotate.py c:\instrument\apps\epics\utils
 IF %errorlevel% neq 0 goto ERROR
 
-for %%t in ( truncate_database force_upgrade_mysql update_calibrations_repository setup_log_rotation ) do (
+for %%t in ( truncate_database upgrade_mysql update_calibrations_repository setup_log_rotation ) do (
     call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step %%t
     IF !errorlevel! neq 0 goto ERROR
 )