database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-4335 Add absolute path into columnstore-post-install and mariadb-columnstore-start.sh

Browse Source
This commit is contained in:
Alexander Barkov
2020-10-05 11:49:23 +04:00
parent 72118c4618
commit 12312f5085
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -134,6 +134,7 @@ oam/install_scripts/columnstoreSyslogSetup.sh
oam/install_scripts/columnstore_module_installer.sh oam/install_scripts/columnstore_module_installer.sh
oam/install_scripts/disable-rep-columnstore.sh oam/install_scripts/disable-rep-columnstore.sh
oam/install_scripts/mariadb-columnstore.service oam/install_scripts/mariadb-columnstore.service
oam/install_scripts/mariadb-columnstore-start.sh
oam/install_scripts/mariadb-command-line.sh oam/install_scripts/mariadb-command-line.sh
oam/install_scripts/master-rep-columnstore.sh oam/install_scripts/master-rep-columnstore.sh
oam/install_scripts/mcs-controllernode.service oam/install_scripts/mcs-controllernode.service

1
oam/install_scripts/CMakeLists.txt
View File

@ -6,6 +6,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstoreLogRotate.in" "${CMAKE_CU
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore-start.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore-start.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh" @ONLY)

2
oam/install_scripts/columnstore-post-install.in
View File

@ -226,7 +226,7 @@ rm -f $lockdir/columnstore
# This was the last place of postConfigure. RIP # This was the last place of postConfigure. RIP
/usr/sbin/install_mcs_mysql.sh --tmpdir=$tmpDir @ENGINE_BINDIR@/install_mcs_mysql.sh --tmpdir=$tmpDir
# Restart MDB to enable plugin # Restart MDB to enable plugin
systemctl cat mariadb.service > /dev/null 2>&1 systemctl cat mariadb.service > /dev/null 2>&1

2
oam/install_scripts/mariadb-columnstore-start.sh → oam/install_scripts/mariadb-columnstore-start.sh.in
View File

@ -15,7 +15,7 @@ flock -n "$fd_lock" || exit 0
/bin/systemctl start mcs-dmlproc /bin/systemctl start mcs-dmlproc
/bin/systemctl start mcs-ddlproc /bin/systemctl start mcs-ddlproc
sleep 2 sleep 2
su -s /bin/sh -c 'dbbuilder 7' mysql 1> /tmp/columnstore_tmp_files/dbbuilder.log su -s /bin/sh -c '@ENGINE_BINDIR@/dbbuilder 7' mysql 1> /tmp/columnstore_tmp_files/dbbuilder.log
flock -u "$fd_lock" flock -u "$fd_lock"