database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-04-18 21:44:02 +03:00
Code

MCOL-3991 Merge packages into one. Cleanup dependencies and remove mcsadmin from uninstall

Browse Source
This commit is contained in:
Jose 2020-05-12 21:36:15 +00:00
parent b8caaaa760
commit 1eef764c01
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/preInstall_storage_engine.sh
View File

@ -1,7 +1,5 @@
if [ "$1" == "2" ]; then
#Perform tasks to prepare for the upgrade installation
mcsadmin shutdown y > /dev/null 2>&1
/bin/cp -f /etc/columnstore/storagemanager.cnf /etc/columnstore/storagemanager.cnf.rpmsave > /dev/null 2>&1
columnstore-pre-uninstall
fi

1
build/preUn_storage_engine.sh
View File

@ -1,5 +1,4 @@
mcsadmin shutdown y
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then

6
cmake/cpackEngineDEB.cmake
View File

@ -56,11 +56,11 @@ if (EXISTS "/etc/debian_version")
set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}")
endif ()
if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1, libjemalloc1")
elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1v5, libreadline5, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1v5, libreadline5, libjemalloc1")
else()
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1")
endif ()
set(CPACK_DEBIAN_COLUMNSTORE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;")

6
cmake/cpackEngineRPM.cmake
View File

@ -77,13 +77,13 @@ IF (EXISTS "/etc/SuSE-release")
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF ()
if (${REDHAT_VERSION_NUMBER} EQUAL 6)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "MariaDB-columnstore-shared" "snappy" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-shared" "snappy" "net-tools")
# Disable auto require as this will also try to pull Boost via RPM
SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "libsnappy1" "jemalloc" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost-devel >= 1.54.0" "libsnappy1" "jemalloc" "net-tools")
else ()
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "snappy" "jemalloc" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "jemalloc" "net-tools")
endif()
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storeage_engine.sh)

19
oam/install_scripts/columnstore-pre-uninstall.in
View File

@ -32,24 +32,15 @@ for arg in "$@"; do
fi
done
#stop services
columnstore stop > /dev/null 2>&1
# Test we are using systemd
systemctl cat mariadb-columnstore.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb-columnstore.service > /dev/null 2>&1
systemctl stop mariadb-columnstore >/dev/null 2>&1
systemctl stop mcs-controllernode > /dev/null 2>&1
systemctl stop mcs-ddlproc > /dev/null 2>&1
systemctl stop mcs-dmlproc > /dev/null 2>&1
systemctl stop mcs-exemgr > /dev/null 2>&1
systemctl stop mcs-primproc > /dev/null 2>&1
systemctl stop mcs-workernode > /dev/null 2>&1
systemctl stop mcs-writeengineserver > /dev/null 2>&1
systemctl stop mcs-loadbrm > /dev/null 2>&1
else
pkill mysqld
PROGS='load_brm workernode controllernode PrimProc ExeMgr DMLProc DDLProc WriteEngineServer'
kill $(pidof $PROGS) > /dev/null
sleep 3
kill -9 $(pidof $PROGS) > /dev/null
fi
cloud=`mcsGetConfig Installation Cloud`
@ -92,7 +83,7 @@ columnstoreSyslogSetup.sh uninstall >/dev/null 2>&1
#remove the start service command
systemctl=`which systemctl 2>/dev/null`
if [ -n "$systemctl" ]; then
if [ -n "$systemctl" && [ $(running_systemd) -eq 0 ]; then
systemctl disable mariadb-columnstore >/dev/null 2>&1
systemctl disable mcs-controllernode > /dev/null 2>&1