From 21e6e88d0f41c828929d774f866b881ec071966a Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Fri, 4 Jun 2021 12:50:15 -0500 Subject: [PATCH] MCOL-4751: autoConfigure to run in post-install on files in correct paths. --- debian/mariadb-plugin-columnstore.install | 1 + oam/install_scripts/columnstore-post-install.in | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install index 39f4e8c72..8a87d1294 100644 --- a/debian/mariadb-plugin-columnstore.install +++ b/debian/mariadb-plugin-columnstore.install @@ -10,6 +10,7 @@ usr/bin/ExeMgr usr/bin/PrimProc usr/bin/StorageManager usr/bin/WriteEngineServer +usr/bin/autoConfigure usr/bin/clearShm usr/bin/cleartablelock usr/bin/columnstore-post-install diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in index e671b3e3f..d41292412 100755 --- a/oam/install_scripts/columnstore-post-install.in +++ b/oam/install_scripts/columnstore-post-install.in @@ -92,9 +92,14 @@ if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf fi +# Make copy of the new .xml file in 2 places so its preserved if something goes wrong in autoConfigure +# Original Columnstore.xml will still be in .rpmsave if [ -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave ]; then + /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmnew /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.new /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml + @ENGINE_BINDIR@/autoConfigure + mv -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.new @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml fi touch /dev/shm/columnstore-test && rm /dev/shm/columnstore-test