1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

MCOL-4597: logic from postConfigure migrated to post-install to upgrade existing columnstore.cnf

This commit is contained in:
benthompson15
2021-03-09 13:33:42 -06:00
committed by David Hall
parent 69a2a003d4
commit 12e3368ebf
7 changed files with 344 additions and 4 deletions

View File

@ -92,6 +92,11 @@ if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf
fi
if [ -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave ]; then
/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
fi
touch /dev/shm/columnstore-test && rm /dev/shm/columnstore-test
if [ $? -ne 0 ] ; then
echo "User $user will need R/W access to /dev/shm."
@ -202,6 +207,14 @@ if [ $user = "root" ]; then
fi
fi
# upgrade the columnstore.cnf file
if [ -f @MARIADB_MYCNFDIR@/columnstore.cnf.rpmsave ]; then
@ENGINE_BINDIR@/mycnfUpgrade > @ENGINE_LOGDIR@/install/mycnfUpgrade.log 2>&1
if [ $? -ne 0 ]; then
echo "Error: Problem upgrade columnstore.cnf, check @ENGINE_LOGDIR@/install/mycnfUpgrade.log"
fi
fi
if [ $user = "root" ]; then
@ENGINE_BINDIR@/columnstoreSyslogSetup.sh install > $installLogDir/syslog_install.log 2>&1

View File

@ -1,6 +1,9 @@
#!/usr/bin/env bash
# MariaDB Columnstore Alias Commands
#
alias ma=mcsadmin
mcspm1host=$(mcsGetConfig PMS1 IPaddr)
mcsapikey=$(grep -r 'x-api-key' /etc/columnstore/cmapi_server.conf | cut -d= -f2 | xargs)
alias core='cd /var/log/mariadb/columnstore/corefiles'
alias tdebug='tail -f /var/log/mariadb/columnstore/debug.log'
alias tinfo='tail -f /var/log/mariadb/columnstore/info.log'
@ -8,4 +11,9 @@ alias terror='tail -f /var/log/mariadb/columnstore/err.log'
alias twarning='tail -f /var/log/mariadb/columnstore/warning.log'
alias tcrit='tail -f /var/log/mariadb/columnstore/crit.log'
alias dbrm='cd /var/lib/columnstore/data1/systemFiles/dbrm'
alias mcsmodule='cat /var/lib/columnstore/local/module'
alias mcsModule='cat /var/lib/columnstore/local/module'
alias mcsStatus="curl -s https://$mcspm1host:8640/cmapi/0.4.0/cluster/status --header 'Content-Type:application/json' --header 'x-api-key:$mcsapikey' -k | jq ."
alias mcsStart="curl -s -X PUT https://$mcspm1host:8640/cmapi/0.4.0/cluster/start --header 'Content-Type:application/json' --header 'x-api-key:$mcsapikey' --data '{\"timeout\":60}' -k | jq ."
alias mcsShutdown="curl -s -X PUT https://$mcspm1host:8640/cmapi/0.4.0/cluster/shutdown --header 'Content-Type:application/json' --header 'x-api-key:$mcsapikey' --data '{\"timeout\":60}' -k | jq ."
alias mcsReadOnly="curl -s -X PUT https://$mcspm1host:8640/cmapi/0.4.0/cluster/mode-set --header 'Content-Type:application/json' --header 'x-api-key:$mcsapikey' --data '{\"timeout\":20, \"mode\": \"readonly\"}' -k | jq ."
alias mcsReadWrite="curl -s -X PUT https://$mcspm1host:8640/cmapi/0.4.0/cluster/mode-set --header 'Content-Type:application/json' --header 'x-api-key:$mcsapikey' --data '{\"timeout\":20, \"mode\": \"readwrite\"}' -k | jq ."

View File

@ -1,18 +1,32 @@
# List of my.cnf arguments that should be checked and saved during upgrade install
#
columnstore_local_query
log-bin
log_bin
server-id
server_id
max_length_for_sort_data
tmpdir
log-error
log_error
general_log_file
slow_query_log_file
general-log
general_log
slow-query-log
slow_query_log
character-set-server
character_set_server
collation-server
collation_server
init-connect
init_connect
binlog_format
secure-auth
secure_auth
port
log_bin_index
relay_log
relay_log_index
gtid_strict_mode
log_slave_updates
columnstore_*