You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
MCS server python code uses python3 by default in (RHEL|Centos)8, (Suse|SLES)15 and Fedora whilst other distributions use default python interpreter.
RPM now restarts MDB on uninstall. systemd logs a message if SM is not configured.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -148,6 +148,8 @@ oam/install_scripts/mcs-writeengineserver.service
|
|||||||
oam/install_scripts/mcs-storagemanager.service
|
oam/install_scripts/mcs-storagemanager.service
|
||||||
oam/install_scripts/mcs_module_installer.sh
|
oam/install_scripts/mcs_module_installer.sh
|
||||||
oam/install_scripts/slave-rep-columnstore.sh
|
oam/install_scripts/slave-rep-columnstore.sh
|
||||||
|
oam/install_scripts/mcs-loadbrm.py
|
||||||
|
oam/install_scripts/mcs-start-storagemanager.py
|
||||||
oam/install_scripts/startupTests.sh
|
oam/install_scripts/startupTests.sh
|
||||||
oam/post/mcstest-001.sh
|
oam/post/mcstest-001.sh
|
||||||
oam/post/mcstest-002.sh
|
oam/post/mcstest-002.sh
|
||||||
|
31
build/postUn_storage_engine.sh
Normal file
31
build/postUn_storage_engine.sh
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
running_systemd() {
|
||||||
|
if [ "$(ps --no-headers -o comm 1)" = "systemd" ]; then
|
||||||
|
echo 0
|
||||||
|
else
|
||||||
|
echo 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
rpmmode=upgrade
|
||||||
|
if [ "$1" -eq "$1" 2> /dev/null ]; then
|
||||||
|
if [ $1 -ne 1 ]; then
|
||||||
|
rpmmode=erase
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
rpmmode=erase
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $rpmmode = erase ]; then
|
||||||
|
if [ ! -z "$(pgrep -x mysqld)" ];then
|
||||||
|
systemctl cat mariadb.service > /dev/null 2>&1
|
||||||
|
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
|
||||||
|
systemctl restart mariadb.service > /dev/null 2>&1
|
||||||
|
else
|
||||||
|
pkill mysqld > /dev/null 2>&1
|
||||||
|
/usr/bin/mysqld_safe &
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
|
@ -89,6 +89,7 @@ endif()
|
|||||||
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh)
|
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh)
|
||||||
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)
|
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)
|
||||||
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_storage_engine.sh)
|
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_storage_engine.sh)
|
||||||
|
SET(CPACK_RPM_columnstore-engine_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postUn_storage_engine.sh)
|
||||||
|
|
||||||
SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE}
|
SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE}
|
||||||
%define ignore \#
|
%define ignore \#
|
||||||
|
@ -23,7 +23,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.service.in" "${CMAKE_CUR
|
|||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service" @ONLY)
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service" @ONLY)
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh" @ONLY)
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh" @ONLY)
|
||||||
|
|
||||||
IF(RPM MATCHES "(rhel|centos)8")
|
IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora")
|
||||||
SET(PYTHON_SHEBANG "#!/usr/bin/env python3")
|
SET(PYTHON_SHEBANG "#!/usr/bin/env python3")
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(PYTHON_SHEBANG "#!/usr/bin/env python")
|
SET(PYTHON_SHEBANG "#!/usr/bin/env python")
|
||||||
|
@ -29,5 +29,7 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
|
|
||||||
if storage.lower() == 's3' and not bucket.lower() == 'some_bucket':
|
if storage.lower() == 's3' and not bucket.lower() == 'some_bucket':
|
||||||
|
print("Using S3 storage.")
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
print("S3 storage has not been set up for MariaDB ColumnStore. StorageManager service fails to start.")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
Reference in New Issue
Block a user