database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

Merge pull request #1424 from drrtuy/MCOL-4295

Browse Source 
MCOL-4295 Replace hardcoded paths with dynamic ones
This commit is contained in:
Jose Rojas
2020-09-08 09:26:59 -05:00
committed by GitHub
parent 177ca584cf 75082659ad
commit 9ac4e756fd
9 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -146,6 +146,7 @@ oam/install_scripts/mcs-stop-controllernode.sh
oam/install_scripts/mcs-workernode.service oam/install_scripts/mcs-workernode.service
oam/install_scripts/mcs-writeengineserver.service oam/install_scripts/mcs-writeengineserver.service
oam/install_scripts/mcs-loadbrm.py oam/install_scripts/mcs-loadbrm.py
oam/install_scripts/mcs-savebrm.py
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

1
oam/install_scripts/CMakeLists.txt
View File

@@ -23,6 +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)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-savebrm.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-savebrm.py" @ONLY)
install(PROGRAMS columnstore-post-install install(PROGRAMS columnstore-post-install
columnstore-pre-uninstall columnstore-pre-uninstall

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

@@ -218,7 +218,7 @@ fi
# Lock directory for root user # Lock directory for root user
lockdir='/var/lock/subsys' lockdir='/var/lock/subsys'
mcsSetConfig -d Installation LockFileDirectory $lockdir @ENGINE_BINDIR@/mcsSetConfig -d Installation LockFileDirectory $lockdir
mkdir $lockdir >/dev/null 2>&1 mkdir $lockdir >/dev/null 2>&1
@@ -270,9 +270,9 @@ if [ ! -z "$MCS_USE_S3_STORAGE" ] && [ $MCS_USE_S3_STORAGE -eq 1 ]; then
if [ -z "$MCS_S3_BUCKET" ] || [ -z "$MCS_S3_ACCESS_KEY_ID" ] || [ -z "$MCS_S3_SECRET_ACCESS_KEY" ]; then if [ -z "$MCS_S3_BUCKET" ] || [ -z "$MCS_S3_ACCESS_KEY_ID" ] || [ -z "$MCS_S3_SECRET_ACCESS_KEY" ]; then
echo "Using local storage." echo "Using local storage."
else else
mcsSetConfig -d Installation DBRootStorageType "storagemanager" @ENGINE_BINDIR@/mcsSetConfig -d Installation DBRootStorageType "storagemanager"
mcsSetConfig -d StorageManager Enabled "Y" @ENGINE_BINDIR@/mcsSetConfig -d StorageManager Enabled "Y"
mcsSetConfig -d SystemConfig DataFilePlugin "libcloudio.so" @ENGINE_BINDIR@/mcsSetConfig -d SystemConfig DataFilePlugin "libcloudio.so"
sed -i "s|service =.*|service = S3|" /etc/columnstore/storagemanager.cnf sed -i "s|service =.*|service = S3|" /etc/columnstore/storagemanager.cnf
if [ ! -z "$MCS_S3_REGION" ]; then if [ ! -z "$MCS_S3_REGION" ]; then
sed -i "s|region =.*|region = $MCS_S3_REGION|" /etc/columnstore/storagemanager.cnf sed -i "s|region =.*|region = $MCS_S3_REGION|" /etc/columnstore/storagemanager.cnf

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

@@ -53,7 +53,7 @@ rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1 rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
#get temp directory #get temp directory
tmpDir=`mcsGetConfig SystemConfig SystemTempFileDir` tmpDir=`@ENGINE_BINDIR@/mcsGetConfig SystemConfig SystemTempFileDir`
if [[ $tmpDir = *"tmp" ]]; then if [[ $tmpDir = *"tmp" ]]; then
# delete tmp files # delete tmp files
rm -rf $tmpDir/* rm -rf $tmpDir/*
@@ -66,7 +66,7 @@ rm -f /var/lib/columnstore/local/moveDbrootTransactionLog
rm -rf /var/log/mariadb/columnstore/ rm -rf /var/log/mariadb/columnstore/
rm -rf /tmp/columnstore_tmp_files rm -rf /tmp/columnstore_tmp_files
lockdir=`mcsGetConfig Installation LockFileDirectory` lockdir=`@ENGINE_BINDIR@/mcsGetConfig Installation LockFileDirectory`
rm -f $lockdir/columnstore rm -f $lockdir/columnstore
#uninstall MariaDB Columnstore system logging #uninstall MariaDB Columnstore system logging

10
oam/install_scripts/columnstore.in
View File

@@ -37,22 +37,22 @@ fi
mt=`module_type` mt=`module_type`
mid=`module_id` mid=`module_id`
has_um=`mcsGetConfig SystemModuleConfig ModuleCount2` has_um=`@ENGINE_BINDIR@/mcsGetConfig SystemModuleConfig ModuleCount2`
if [ "x$has_um" = x ]; then if [ "x$has_um" = x ]; then
has_um=0 has_um=0
fi fi
lockdir=`mcsGetConfig Installation LockFileDirectory` lockdir=`@ENGINE_BINDIR@/mcsGetConfig Installation LockFileDirectory`
#get temp directory #get temp directory
tmpDir=`mcsGetConfig SystemConfig SystemTempFileDir` tmpDir=`@ENGINE_BINDIR@/mcsGetConfig SystemConfig SystemTempFileDir`
mkdir $tmpDir >/dev/null 2>&1 mkdir $tmpDir >/dev/null 2>&1
if [ $USER == "root" ]; then if [ $USER == "root" ]; then
chmod 777 $tmpDir chmod 777 $tmpDir
fi fi
checkInstallSetup() { checkInstallSetup() {
InitialInstallFlag=`mcsGetConfig -c @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml Installation InitialInstallFlag` InitialInstallFlag=`@ENGINE_BINDIR@/mcsGetConfig -c @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml Installation InitialInstallFlag`
if [ $InitialInstallFlag != "y" ]; then if [ $InitialInstallFlag != "y" ]; then
echo "Please run the postConfigure install script, check the Installation Guide" echo "Please run the postConfigure install script, check the Installation Guide"
echo "for additional details" echo "for additional details"
@@ -76,7 +76,7 @@ start() {
#checkInstallSetup #checkInstallSetup
CoreFileFlag=`mcsGetConfig -c @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml Installation CoreFileFlag` CoreFileFlag=`@ENGINE_BINDIR@/mcsGetConfig -c @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml Installation CoreFileFlag`
if [ $CoreFileFlag = "y" ]; then if [ $CoreFileFlag = "y" ]; then
#columnstore core files #columnstore core files
ulimit -c unlimited > /dev/null 2>&1 ulimit -c unlimited > /dev/null 2>&1

4
oam/install_scripts/columnstoreSyslogSetup.sh.in
View File

@@ -50,7 +50,7 @@ columnstoreSyslogFile=@ENGINE_SUPPORTDIR@/columnstoreSyslog
columnstoreSyslogFile7=@ENGINE_SUPPORTDIR@/columnstoreSyslog7 columnstoreSyslogFile7=@ENGINE_SUPPORTDIR@/columnstoreSyslog7
#get temp directory #get temp directory
tmpDir=`mcsGetConfig SystemConfig SystemTempFileDir` tmpDir=`@ENGINE_BINDIR@/mcsGetConfig SystemConfig SystemTempFileDir`
checkSyslog() { checkSyslog() {
#check which syslog daemon is being used #check which syslog daemon is being used
@@ -176,7 +176,7 @@ install() {
makeDir makeDir
checkSyslog checkSyslog
if [ ! -z "$syslog_conf" ] ; then if [ ! -z "$syslog_conf" ] ; then
mcsSetConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1 @ENGINE_BINDIR@/mcsSetConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1
if [ $non_root_user == "yes" ]; then if [ $non_root_user == "yes" ]; then
chown $user:$user @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml* chown $user:$user @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml*
fi fi

2
oam/install_scripts/mcs-loadbrm.py.in
View File

@@ -51,7 +51,7 @@ if __name__ == '__main__':
dbrmroot = config_root.find('./SystemConfig/DBRMRoot').text dbrmroot = config_root.find('./SystemConfig/DBRMRoot').text
pmCount = int(config_root.find('./SystemModuleConfig/ModuleCount3').text) pmCount = int(config_root.find('./SystemModuleConfig/ModuleCount3').text)
loadbrm = '/usr/bin/load_brm' loadbrm = '@ENGINE_BINDIR@/load_brm'
brm_saves_current = '' brm_saves_current = ''

2
oam/install_scripts/mcs-savebrm.py → oam/install_scripts/mcs-savebrm.py.in
View File

@@ -36,7 +36,7 @@ if __name__ == '__main__':
storage = sm_config.get('ObjectStorage', 'service') storage = sm_config.get('ObjectStorage', 'service')
default_addr = '127.0.0.1' default_addr = '127.0.0.1'
savebrm = 'save_brm' savebrm = '@ENGINE_BINDIR@/save_brm'
is_primary = False is_primary = False
# For multi-node with local storage or default installations # For multi-node with local storage or default installations

2
oam/install_scripts/mcs-stop-controllernode.sh.in
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
/bin/kill -15 "$1" /bin/kill -15 "$1"
timeout=$(mcsGetConfig SystemConfig DBRMTimeout) timeout=$(@ENGINE_BINDIR@/mcsGetConfig SystemConfig DBRMTimeout)
while [ -n "$(pgrep -x controllernode)" ] && [ $timeout -gt 0 ] while [ -n "$(pgrep -x controllernode)" ] && [ $timeout -gt 0 ]
do do