diff --git a/oam/install_scripts/binary_installer.sh b/oam/install_scripts/binary_installer.sh index 9b0a14588..9952ec566 100644 --- a/oam/install_scripts/binary_installer.sh +++ b/oam/install_scripts/binary_installer.sh @@ -48,12 +48,12 @@ spawn -noecho /bin/bash if { $INSTALLTYPE == "initial" || $INSTALLTYPE == "uninstall" } { # - # remove Calpont files + # remove MariaDB Columnstore files # - send_user "Uninstall Calpont Package " + send_user "Uninstall MariabDB Columnstore Package " send " \n" send date\n - send "ssh $USERNAME@$SERVER 'rm -f /etc/init.d/infinidb /etc/init.d/mysql-Columnstore $INSTALLDIR/releasenum >/dev/null 2>&1'\n" + send "ssh $USERNAME@$SERVER 'rm -f /etc/init.d/columnstore /etc/init.d/mysql-Columnstore $INSTALLDIR/releasenum >/dev/null 2>&1'\n" set timeout 20 expect { "Host key verification failed" { send_user "FAILED: Host key verification failed\n" ; exit 1} @@ -68,12 +68,12 @@ if { $INSTALLTYPE == "initial" || $INSTALLTYPE == "uninstall" } { "passphrase" { send "$PASSWORD\n" } "Permission denied, please try again" { send_user "ERROR: Invalid password\n" ; exit 1 } "No route to host" { send_user "ERROR: No route to host\n" ; exit 1 } - "Calpont uninstall completed" { send_user "DONE" } + "MariabDB Columnstore uninstall completed" { send_user "DONE" } } set timeout 30 expect { "Read-only file system" { send_user "ERROR: local disk - Read-only file system\n" ; exit 1} - "Calpont uninstall completed" { send_user "DONE" } + "MariabDB Columnstore uninstall completed" { send_user "DONE" } } send_user "\n" } @@ -82,9 +82,9 @@ if { $INSTALLTYPE == "uninstall" } { } sleep 10 # -# send the Calpont package +# send the MariabDB Columnstore package # -send_user "Copy New Calpont Package to Module " +send_user "Copy New MariabDB Columnstore Package to Module " send " \n" send date\n send "scp $CALPONTPKG $USERNAME@$SERVER:$CALPONTPKG\n" @@ -113,7 +113,7 @@ sleep 5 # # install package # -send_user "Install Calpont Package on Module " +send_user "Install MariabDB Columnstore Package on Module " send " \n" send date\n send "ssh $USERNAME@$SERVER 'tar -C $PREFIX --exclude db -zxf $CALPONTPKG;cat $INSTALLDIR/releasenum'\n" @@ -133,7 +133,7 @@ expect { "No route to host" { send_user "ERROR: No route to host\n" ; exit 1 } timeout { send_user "ERROR: Timeout\n" ; exit 1 } } -#sleep to give time for cat Calpont/releasenum to complete +#sleep to give time for cat MariabDB Columnstore/releasenum to complete sleep 5 send_user "\n" @@ -164,7 +164,7 @@ if { $INSTALLTYPE == "initial"} { # # copy over calpont config file # - send_user "Copy Calpont Config file to Module " + send_user "Copy MariabDB Columnstore Config file to Module " send " \n" send date\n send "scp $INSTALLDIR/etc/* $USERNAME@$SERVER:$INSTALLDIR/etc\n" @@ -208,7 +208,7 @@ if { $INSTALLTYPE == "initial"} { # # copy over calpont OS files # - send_user "Copy Calpont OS files to Module " + send_user "Copy MariabDB Columnstore OS files to Module " send " \n" send date\n send "scp $INSTALLDIR/local/etc/$MODULE/* $USERNAME@$SERVER:$INSTALLDIR/local\n" diff --git a/oam/install_scripts/calpontSyslog-ng b/oam/install_scripts/calpontSyslog-ng index c4d30e3e0..8dead4b04 100755 --- a/oam/install_scripts/calpontSyslog-ng +++ b/oam/install_scripts/calpontSyslog-ng @@ -1,6 +1,6 @@ -# Calpont Database Platform Logging +# MariaDB Columnstore Database Platform Logging -source s_infinidb { +source s_columnstore { # message generated by Syslog-NG internal(); # standard Linux log source (this is the default place for the syslog() @@ -45,33 +45,33 @@ destination d_data_mods{ }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local1crit); destination(d_crit); }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local1err); destination(d_err); }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local1warning); destination(d_warning); }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local1info); destination(d_info); }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local1debug); destination(d_debug); }; log{ - source(s_infinidb); + source(s_columnstore); filter(f_local2crit); destination(d_data_mods); }; diff --git a/oam/install_scripts/calpontSyslog7 b/oam/install_scripts/calpontSyslog7 index d3d34cdc9..70938eaa8 100644 --- a/oam/install_scripts/calpontSyslog7 +++ b/oam/install_scripts/calpontSyslog7 @@ -1,4 +1,4 @@ -# Calpont Database Platform Logging +# MariaDB Columnstore Database Platform Logging local1.crit -/var/log/Columnstore/crit.log local1.err -/var/log/Columnstore/err.log local1.warning -/var/log/Columnstore/warning.log diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore index 4f2e569bc..5de5b6d3d 100644 --- a/oam/install_scripts/columnstore +++ b/oam/install_scripts/columnstore @@ -112,14 +112,14 @@ start() { RETVAL=0 echo "Starting MariaDB Columnstore Database Platform" - rm -f /tmp/StopCalpont + rm -f /tmp/StopColumnstore exec $InstallDir/bin/run.sh $InstallDir/bin/ProcMon > /dev/null 2>&1 & return $RETVAL } stop() { echo "Shutting down MariaDB Columnstore Database Platform" - touch /tmp/StopCalpont + touch /tmp/StopColumnstore pkill -9 ProcMon pkill -9 ProcMgr pkill -9 snmptrapd diff --git a/oam/install_scripts/columnstore.def b/oam/install_scripts/columnstore.def index ab843979a..28ec0512a 100644 --- a/oam/install_scripts/columnstore.def +++ b/oam/install_scripts/columnstore.def @@ -1,5 +1,5 @@ #!/bin/bash -# Copy this file to /etc/default and rename it to 'infinidb'. +# Copy this file to /etc/default and rename it to 'columnstore'. # Change this line to your InfiniDB installation directory INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore diff --git a/oam/install_scripts/columnstoreLogRotate b/oam/install_scripts/columnstoreLogRotate index edeee5e1c..781b2da6c 100644 --- a/oam/install_scripts/columnstoreLogRotate +++ b/oam/install_scripts/columnstoreLogRotate @@ -1,5 +1,5 @@ # -# Calpont Log Rotate file that gets installed in /etc/logrotate.d +# MariaDb Columnstore Log Rotate file that gets installed in /etc/logrotate.d # as part of the RPM installation # diff --git a/oam/install_scripts/columnstoreSyslog b/oam/install_scripts/columnstoreSyslog index dab3c966b..c618c7e76 100644 --- a/oam/install_scripts/columnstoreSyslog +++ b/oam/install_scripts/columnstoreSyslog @@ -1,4 +1,4 @@ -# Calpont Database Platform Logging +# MariaDB Columnstore Database Platform Logging local1.=crit -/var/log/Columnstore/crit.log local1.=err -/var/log/Columnstore/err.log local1.=warning -/var/log/Columnstore/warning.log diff --git a/oam/install_scripts/columnstoreSyslog7 b/oam/install_scripts/columnstoreSyslog7 index d3d34cdc9..b17a40fe2 100644 --- a/oam/install_scripts/columnstoreSyslog7 +++ b/oam/install_scripts/columnstoreSyslog7 @@ -1,4 +1,4 @@ -# Calpont Database Platform Logging +# MariaDb Columnstore Database Platform Logging local1.crit -/var/log/Columnstore/crit.log local1.err -/var/log/Columnstore/err.log local1.warning -/var/log/Columnstore/warning.log diff --git a/oam/install_scripts/crontab b/oam/install_scripts/crontab index 90aa62f0a..2da8e662e 100644 --- a/oam/install_scripts/crontab +++ b/oam/install_scripts/crontab @@ -1,5 +1,5 @@ # -# Calpont version with Daily running at midnight +# MariaDB Columnstore version with Daily running at midnight # SHELL=/bin/bash diff --git a/oam/install_scripts/install_scripts.kdevelop.pcs b/oam/install_scripts/install_scripts.kdevelop.pcs deleted file mode 100644 index 164edbc42..000000000 Binary files a/oam/install_scripts/install_scripts.kdevelop.pcs and /dev/null differ diff --git a/oam/install_scripts/install_scripts.kdevses b/oam/install_scripts/install_scripts.kdevses index 06482d2a3..86c603b03 100644 --- a/oam/install_scripts/install_scripts.kdevses +++ b/oam/install_scripts/install_scripts.kdevses @@ -1,31 +1,10 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - diff --git a/oam/install_scripts/performance_installer.sh b/oam/install_scripts/performance_installer.sh index bc9e7a6ef..fa3084e0b 100644 --- a/oam/install_scripts/performance_installer.sh +++ b/oam/install_scripts/performance_installer.sh @@ -41,17 +41,17 @@ log_user $DEBUG spawn -noecho /bin/bash # if { $PKGTYPE == "rpm" } { - set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^infinidb')" + set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^mariabd-columnstore')" set PKGERASE1 "rpm -e --nodeps " - set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" - set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" + set PKGINSTALL "rpm -ivh $NODEPS --force mariabd-columnstore*$VERSION*" + set PKGUPGRADE "rpm -Uvh --noscripts mariabd-columnstore*$VERSION*" } else { if { $PKGTYPE == "deb" } { - set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^infinidb')" + set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^mariabd-columnstore')" set PKGERASE1 "dpkg -P " - set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*" - set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*" + set PKGINSTALL "dpkg -i --force-confnew mariabd-columnstore*$VERSION*" + set PKGUPGRADE "dpkg -i --force-confnew mariabd-columnstore*$VERSION*" } else { if { $PKGTYPE != "bin" } { send_user "Invalid Package Type of $PKGTYPE" @@ -125,7 +125,7 @@ if { $INSTALLTYPE == "uninstall" } { exit 0 } set timeout 30 #expect -re {[$#] } send_user "Copy New InfiniDB Package to Module " -send "ssh $USERNAME@$SERVER 'rm -f /root/infinidb-*.$PKGTYPE'\n" +send "ssh $USERNAME@$SERVER 'rm -f /root/mariabd-columnstore-*.$PKGTYPE'\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { @@ -144,7 +144,7 @@ expect { -re {[$#] } { } } -send "scp $HOME/infinidb*$VERSION* $USERNAME@$SERVER:.;$PKGERASE dummy\n" +send "scp $HOME/mariabd-columnstore*$VERSION* $USERNAME@$SERVER:.;$PKGERASE dummy\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { @@ -172,7 +172,7 @@ if { $INSTALLTYPE == "initial"} { # send_user "Install InfiniDB Packages on Module " - send "ssh $USERNAME@$SERVER '$PKGINSTALL infinidb*$VERSION* ;$PKGERASE dummy'\n" + send "ssh $USERNAME@$SERVER '$PKGINSTALL mariabd-columnstore*$VERSION* ;$PKGERASE dummy'\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index cbcb05e32..b83afea69 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -145,7 +145,7 @@ cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1 # delete Calpont shared memory segments -$installdir/bin/Calpont/bin/clearShm > /dev/null 2>&1 +$installdir/bin/clearShm > /dev/null 2>&1 #setup the columnstore service script rm -f /etc/init.d/columnstore >/dev/null 2>&1 @@ -172,7 +172,7 @@ else sudo chmod -R 755 /var/log/Columnstore sudo chmod -R 777 /dev/shm sudo rm -f /var/lock/subsys/mysql-Columnstore - sudo rm -f /tmp/StopCalpont + sudo rm -f /tmp/StopColumnstore sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/columnstore.def sudo cp $installdir/bin/columnstore.def /etc/default/columnstore @@ -191,9 +191,9 @@ touch ${bashFile} if [ $installdir != "/usr/local/MariaDB/Columnstore" ]; then sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/columnstoreAlias fi -egrep -qs 'Calpont Database Platform Alias Commands' ${bashFile} +egrep -qs 'MariaDB Columnstore Database Platform Alias Commands' ${bashFile} rc1=$? -egrep -qs 'InfiniDB Alias Commands' ${bashFile} +egrep -qs 'MariaDB Columnstore Alias Commands' ${bashFile} rc2=$? if [ $rc1 -ne 0 -a $rc2 -ne 0 ]; then rm -f ${bashFile}.columnstoreSave diff --git a/oam/install_scripts/post-mysql-install b/oam/install_scripts/post-mysql-install index 2b9be81d3..5f7f24cc5 100755 --- a/oam/install_scripts/post-mysql-install +++ b/oam/install_scripts/post-mysql-install @@ -24,24 +24,24 @@ checkForError() { rm -f /tmp/error.check #--------------------------------------------------------------------------- - # See if engine infinidb exist + # See if engine columnstore exist #--------------------------------------------------------------------------- - echo "checking for engine infinidb..." + echo "checking for engine columnstore..." $installdir/mysql/bin/mysql \ --defaults-file=$installdir/mysql/my.cnf \ --user=root $pwprompt \ --execute='show engines;' \ - calpontsys | grep -i infinidb + calpontsys | grep -i columnstore # # Add compressiontype column to SYSCOLUMN if applicable # if [ $? -ne 0 ]; then - echo "infinidb doesn't exist" + echo "columnstore doesn't exist" return 1 fi - echo "infinidb exist" + echo "columnstore exist" return 0; } diff --git a/oam/install_scripts/post-mysqld-install b/oam/install_scripts/post-mysqld-install index 4408ed1b8..5ea357b12 100755 --- a/oam/install_scripts/post-mysqld-install +++ b/oam/install_scripts/post-mysqld-install @@ -2,7 +2,7 @@ # # $Id: post-mysqld-install 3661 2013-06-25 22:04:33Z dhill $ # -# Post-install steps for infinidb-mysql install +# Post-install steps for columnstore-mysql install prefix=/usr/local installdir=$prefix/MariaDB/Columnstore diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall index 87c7ecb23..7262d88c9 100755 --- a/oam/install_scripts/pre-uninstall +++ b/oam/install_scripts/pre-uninstall @@ -67,7 +67,7 @@ export INFINIDB_INSTALL_DIR=$installdir cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud` if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then if test -f /etc/fstab ; then - $sudo sed -i '/Calpont\/data/d' /etc/fstab > /dev/null 2>&1 + $sudo sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1 fi fi @@ -79,11 +79,11 @@ rm -f /var/log/Columnstore/*.log1 > /dev/null 2>&1 rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1 sudo rm -f /etc/default/columnstore -# remove Calpont Log Rotate File abd Transaction Log File +# remove Mariab Columnstore Log Rotate File abd Transaction Log File rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1 rm -f /etc/cron.d/transactionLog > /dev/null 2>&1 -# delete Calpont shared memory segments +# delete Mariab Columnstore shared memory segments pkill -9 ProcMon $installdir/bin/clearShm > /dev/null 2>&1 @@ -150,7 +150,7 @@ fi #tell user to run post configure script echo " " -echo "Calpont uninstall completed" +echo "Mariab Columnstore uninstall completed" exit 0 diff --git a/oam/install_scripts/run.sh b/oam/install_scripts/run.sh index bcd5dd39e..0cef59ffe 100755 --- a/oam/install_scripts/run.sh +++ b/oam/install_scripts/run.sh @@ -47,7 +47,7 @@ fi while [ $keep_going -ne 0 ]; do $exename $args - if [ -e /tmp/StopCalpont ]; then + if [ -e /tmp/StopColumnstore ]; then exit 0 fi if [ $topt -gt 0 -a $retries -ge $topt ]; then diff --git a/oam/install_scripts/startupTests.sh b/oam/install_scripts/startupTests.sh index 5836af965..07cb09537 100755 --- a/oam/install_scripts/startupTests.sh +++ b/oam/install_scripts/startupTests.sh @@ -6,7 +6,7 @@ # called by Process-Monitor if [ -z "$INFINIDB_INSTALL_DIR" ]; then - test -f /etc/default/infinidb && . /etc/default/infinidb + test -f /etc/default/columnstore && . /etc/default/columnstore fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh index 0ab0d3aa3..dd4798498 100644 --- a/oam/install_scripts/syslogSetup.sh +++ b/oam/install_scripts/syslogSetup.sh @@ -2,7 +2,7 @@ # # $Id: syslogSetup.sh 421 2007-04-05 15:46:55Z dhill $ # -# syslogSetup.sh - install / uninstall Calpont InfiniDB system logging configuration +# syslogSetup.sh - install / uninstall MariaDB Columnstore system logging configuration # no point in going any further if not root... (only works in bash) test $EUID -eq 0 || exit 0 @@ -148,12 +148,12 @@ checkSyslog if [ ! -z "$syslog_conf" ] ; then $installdir/bin/setConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1 if [ "$syslog_conf" != /etc/rsyslog.d/calpont.conf ]; then - rm -f ${syslog_conf}.calpontSave - cp ${syslog_conf} ${syslog_conf}.calpontSave >/dev/null 2>&1 - sed -i '/# Calpont/,$d' ${syslog_conf}.calpontSave > /dev/null 2>&1 + rm -f ${syslog_conf}.columnstoreSave + cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1 + sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1 fi - egrep -qs 'Calpont Database Platform Logging' ${syslog_conf} + egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf} if [ $? -ne 0 ]; then #set the syslog for calpont logging # remove older version incase it was installed by previous build @@ -181,18 +181,18 @@ checkSyslog if [ ! -z "$syslog_conf" ] ; then if [ "$syslog_conf" != /etc/rsyslog.d/calpont.conf ]; then if [ "$syslog_conf" != /etc/rsyslog.d/49-calpont.conf ]; then - egrep -qs 'Calpont Database Platform Logging' ${syslog_conf} + egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf} if [ $? -eq 0 ]; then - if [ -f ${syslog_conf}.calpontSave ] ; then + if [ -f ${syslog_conf}.columnstoreSave ] ; then #uninstall the syslog for calpont logging mv -f ${syslog_conf} ${syslog_conf}.calpontBackup - mv -f ${syslog_conf}.calpontSave ${syslog_conf} >/dev/null 2>&1 + mv -f ${syslog_conf}.columnstoreSave ${syslog_conf} >/dev/null 2>&1 if [ ! -f ${syslog_conf} ] ; then cp ${syslog_conf}.calpontBackup ${syslog_conf} fi fi fi - sed -i '/# Calpont/,$d' ${syslog_conf} > /dev/null 2>&1 + sed -i '/# MariaDB/,$d' ${syslog_conf} > /dev/null 2>&1 else rm -f "$syslog_conf" fi @@ -214,11 +214,11 @@ fi status() { checkSyslog if [ ! -z "$syslog_conf" ] ; then - egrep -qs 'Calpont Database Platform Logging' ${syslog_conf} + egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf} if [ $? -eq 0 ]; then echo $syslog_conf else - echo "No System Log Config File configured for InfiniDB System Logging" + echo "No System Log Config File configured for MariaDB Columnstore System Logging" fi fi } diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh index 1e3986807..75cd8e4f1 100644 --- a/oam/install_scripts/user_installer.sh +++ b/oam/install_scripts/user_installer.sh @@ -47,17 +47,17 @@ log_user $DEBUG spawn -noecho /bin/bash # if { $PKGTYPE == "rpm" } { - set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^infinidb')" + set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^mariabd-columnstore')" set PKGERASE1 "rpm -e --nodeps " - set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" - set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" + set PKGINSTALL "rpm -ivh $NODEPS --force mariabd-columnstore*$VERSION*" + set PKGUPGRADE "rpm -Uvh --noscripts mariabd-columnstore*$VERSION*" } else { if { $PKGTYPE == "deb" } { - set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^infinidb')" + set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^mariabd-columnstore')" set PKGERASE1 "dpkg -P " - set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*" - set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*" + set PKGINSTALL "dpkg -i --force-confnew mariabd-columnstore*$VERSION*" + set PKGUPGRADE "dpkg -i --force-confnew mariabd-columnstore*$VERSION*" } else { send_user "Invalid Package Type of $PKGTYPE" exit 1 @@ -126,7 +126,7 @@ if { $INSTALLTYPE == "uninstall" } { exit 0 } set timeout 30 #expect -re {[$#] } send_user "Copy new InfiniDB Packages to Module " -send "ssh $USERNAME@$SERVER 'rm -f /root/infinidb-*.$PKGTYPE'\n" +send "ssh $USERNAME@$SERVER 'rm -f /root/mariabd-columnstore-*.$PKGTYPE'\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { @@ -146,7 +146,7 @@ expect { -re {[$#] } { } } -send "scp $HOME/infinidb*$VERSION* $USERNAME@$SERVER:.;$PKGERASE dummy\n" +send "scp $HOME/mariabd-columnstore*$VERSION* $USERNAME@$SERVER:.;$PKGERASE dummy\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 61ca26767..0cad2fa1a 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2014 MariaDB Columnstore, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -164,7 +164,7 @@ bool waitForStop() //------------------------------------------------------------------------------ void handleSigTerm(int i) { - std::cout << "Received SIGTERM to terminate Calpont Console..." << std::endl; + std::cout << "Received SIGTERM to terminate MariDB Columnstore Console..." << std::endl; } @@ -324,9 +324,9 @@ int main(int argc, char *argv[]) } else { - cout << endl << "Calpont InfiniDB Command Console" << endl; + cout << endl << "MariaDB Columnstore Admin Console" << endl; cout << " enter 'help' for list of commands" << endl; - cout << " enter 'exit' to exit the Calpont InfiniDB Command Console" << endl; + cout << " enter 'exit' to exit the MariaDB Columnstore Command Console" << endl; cout << " use up/down arrows to recall commands" << endl << endl; // output current active alarm stats @@ -348,7 +348,7 @@ int main(int argc, char *argv[]) } // read input - pcommand = readline("InfiniDB> "); + pcommand = readline("MariaDB-Columnstore > "); if (!pcommand) // user hit -D pcommand = strdup("exit"); @@ -695,7 +695,7 @@ int processCommand(string* arguments) // close the log file writeLog("End of a command session!!!"); logFile.close(); - cout << "Exiting the Calpont Command Console" << endl; + cout << "Exiting the MariaDB Columnstore Admin Console" << endl; exit (0); } @@ -1876,7 +1876,7 @@ int processCommand(string* arguments) break; } - cout << endl << "This command stops the processing of applications on all Modules within the Calpont System" << endl; + cout << endl << "This command stops the processing of applications on all Modules within the MariDB Columnstore System" << endl; try { @@ -1993,7 +1993,7 @@ int processCommand(string* arguments) bool bDBRMReady = dbrm.isDBRMReady(); getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm); - cout << endl << "This command stops the processing of applications on all Modules within the Calpont System" << endl; + cout << endl << "This command stops the processing of applications on all Modules within the MariDB Columnstore System" << endl; try { @@ -2092,15 +2092,15 @@ int processCommand(string* arguments) if ( DBRootStorageType == "hdfs") { - string cmd = "pdsh -a '/" + startup::StartUp::installDir() + "/bin/infinidb stop' > /tmp/cc-stop.pdsh 2>&1"; + string cmd = "pdsh -a '/" + startup::StartUp::installDir() + "/bin/columnstore stop' > /tmp/cc-stop.pdsh 2>&1"; system(cmd.c_str()); if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") ) { - cout << endl << "ERROR: Stopping InfiniDB Service failure, check /tmp/cc-stop.pdsh. exit..." << endl; + cout << endl << "ERROR: Stopping MariaDB Columnstore Service failure, check /tmp/cc-stop.pdsh. exit..." << endl; } } else { - string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log"; system(cmd.c_str()); } } @@ -2110,17 +2110,17 @@ int processCommand(string* arguments) if ( gracefulTemp == FORCEFUL ) { - string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log"; system(cmd.c_str()); - cout << endl << " Successful shutdown of System (stopped local infinidb service) " << endl << endl; + cout << endl << " Successful shutdown of System (stopped local columnstore service) " << endl << endl; } if (Failed.find("Connection refused") != string::npos) { - cout << endl << "**** shutdownSystem Error : ProcessManager not Active, stopping infinidb service" << endl; - string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log"; + cout << endl << "**** shutdownSystem Error : ProcessManager not Active, stopping columnstore service" << endl; + string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log"; system(cmd.c_str()); - cout << endl << " Successful stop of local infinidb service " << endl << endl; + cout << endl << " Successful stop of local columnstore service " << endl << endl; } else { @@ -2137,10 +2137,10 @@ int processCommand(string* arguments) if ( DBRootStorageType == "hdfs") { - string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb stop' > /tmp/cc-stop.pdsh 2>&1"; + string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore stop' > /tmp/cc-stop.pdsh 2>&1"; system(cmd.c_str()); if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") ) { - cout << endl << "ERROR: Stopping InfiniDB Service failure, check /tmp/cc-stop.pdsh. exit..." << endl; + cout << endl << "ERROR: Stopping MariaDB Columnstore Service failure, check /tmp/cc-stop.pdsh. exit..." << endl; break; } } @@ -2160,16 +2160,16 @@ int processCommand(string* arguments) break; } - // if infinidb service is down, then start system by starting all of the infinidb services + // if columnstore service is down, then start system by starting all of the columnstore services // this would be used after a shutdownSystem command - // if infinidb service is up, send message to ProcMgr to start system (which starts all processes) + // if columnstore service is up, send message to ProcMgr to start system (which starts all processes) - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (!oam.checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) { - cout << "startSystem command, 'infinidb' service is down, sending command to" << endl; - cout << "start the 'infinidb' service on all modules" << endl << endl; + cout << "startSystem command, 'columnstore' service is down, sending command to" << endl; + cout << "start the 'columnstore' service on all modules" << endl << endl; SystemModuleTypeConfig systemmoduletypeconfig; ModuleTypeConfig moduletypeconfig; @@ -2203,7 +2203,7 @@ int processCommand(string* arguments) password = "ssh"; // - // perform start of InfiniDB of other servers in the system + // perform start of columnstore of other servers in the system // DeviceNetworkList::iterator pt; @@ -2235,10 +2235,10 @@ int processCommand(string* arguments) if ( DBRootStorageType == "hdfs") { - string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb restart' > /tmp/cc-restart.pdsh 2>&1"; + string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore restart' > /tmp/cc-restart.pdsh 2>&1"; system(cmd.c_str()); if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") ) { - cout << endl << "ERROR: Restart InfiniDB Service failure, check /tmp/cc-restart.pdsh. exit..." << endl; + cout << endl << "ERROR: Restart MariaDB Columnstore Service failure, check /tmp/cc-restart.pdsh. exit..." << endl; break; } } @@ -2269,11 +2269,11 @@ int processCommand(string* arguments) if ( modulename == localModule ) { - cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1"; + cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1"; int rtnCode = system(cmd.c_str()); if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0) { - cout << endl << "error with running 'infinidb restart' on local module " << endl; + cout << endl << "error with running 'columnstore restart' on local module " << endl; cout << endl << "**** startSystem Failed" << endl; break; } @@ -2285,14 +2285,14 @@ int processCommand(string* arguments) for( ; pt1 != (*pt).hostConfigList.end() ; pt1++) { //run remote command script - cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/infinidb restart' 0"; + cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/columnstore restart' 0"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) < 0) { - cout << endl << "error with running 'infinidb start' on module " + modulename << endl; + cout << endl << "error with running 'columnstore start' on module " + modulename << endl; cout << endl << "**** startSystem Failed" << endl; - // stop local infinidb service - cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1"; + // stop local columnstore service + cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1"; system(cmd.c_str()); FAILED = true; @@ -2301,11 +2301,11 @@ int processCommand(string* arguments) else { if (rtnCode > 0) { - cout << endl << "Invalid Password when running 'infinidb start' on module " + modulename << ", can retry by providing password as the second argument" << endl; + cout << endl << "Invalid Password when running 'columnstore start' on module " + modulename << ", can retry by providing password as the second argument" << endl; cout << endl << "**** startSystem Failed" << endl; - // stop local infinidb service - cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1"; + // stop local columnstore service + cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1"; system(cmd.c_str()); FAILED = true; @@ -2329,10 +2329,10 @@ int processCommand(string* arguments) //just kick off local server cout << " System being started, please wait..."; cout.flush(); - cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1"; + cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1"; int rtnCode = system(cmd.c_str()); if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0) { - cout << endl << "error with running 'infinidb restart' on local module " << endl; + cout << endl << "error with running 'columnstore restart' on local module " << endl; cout << endl << "**** startSystem Failed" << endl; break; } @@ -2378,21 +2378,21 @@ int processCommand(string* arguments) break; } - // if infinidb service is down, then start system by starting all of the infinidb services + // if columnstore service is down, then start system by starting all of the columnstore services // this would be used after a shutdownSystem command - // if infinidb service is up, send message to ProcMgr to start system (which starts all processes) + // if columnstore service is up, send message to ProcMgr to start system (which starts all processes) - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (!oam.checkLogStatus("/tmp/status.log", "columnstore is running") ) { if (bNeedsConfirm) { if (confirmPrompt("")) // returns true if user wants to quit. break; } - cout << "restartSystem command, 'infinidb' service is down, sending command to" << endl; - cout << "start the 'infinidb' service on all modules" << endl << endl; + cout << "restartSystem command, 'columnstore' service is down, sending command to" << endl; + cout << "start the 'columnstore' service on all modules" << endl << endl; SystemModuleTypeConfig systemmoduletypeconfig; ModuleTypeConfig moduletypeconfig; @@ -2424,7 +2424,7 @@ int processCommand(string* arguments) password = "ssh"; // - // perform start of InfiniDB of other servers in the system + // perform start of columnstore of other servers in the system // DeviceNetworkList::iterator pt; @@ -2456,10 +2456,10 @@ int processCommand(string* arguments) if ( DBRootStorageType == "hdfs") { - string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb restart' > /tmp/cc-restart.pdsh 2>&1"; + string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore restart' > /tmp/cc-restart.pdsh 2>&1"; system(cmd.c_str()); if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") ) { - cout << endl << "ERROR: Restart InfiniDB Service failue, check /tmp/cc-restart.pdsh. exit..." << endl; + cout << endl << "ERROR: Restart MariaDB Columnstore Service failue, check /tmp/cc-restart.pdsh. exit..." << endl; break; } } @@ -2495,15 +2495,15 @@ int processCommand(string* arguments) for( ; pt1 != (*pt).hostConfigList.end() ; pt1++) { //run remote command script - cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/infinidb restart' 0"; + cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/columnstore restart' 0"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) < 0) { - cout << endl << "error with running 'infinidb start' on module " + modulename << endl; + cout << endl << "error with running 'columnstore start' on module " + modulename << endl; cout << endl << "**** restartSystem Failed" << endl; - // stop local infinidb service - cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1"; + // stop local columnstore service + cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1"; system(cmd.c_str()); FAILED = true; @@ -2512,12 +2512,12 @@ int processCommand(string* arguments) else { if (rtnCode > 0) { - cout << endl << "Invalid Password when running 'infinidb start' on module " + modulename << ", can retry by providing password as the second argument" << endl; + cout << endl << "Invalid Password when running 'columnstore start' on module " + modulename << ", can retry by providing password as the second argument" << endl; cout << endl << "**** restartSystem Failed" << endl; FAILED = true; - // stop local infinidb service - cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1"; + // stop local columnstore service + cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1"; system(cmd.c_str()); break; @@ -2531,11 +2531,11 @@ int processCommand(string* arguments) break; //RESTART LOCAL HOST - cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1"; + cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1"; int rtnCode = system(cmd.c_str()); if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0) { - cout << endl << "error with running 'infinidb restart' on local module " << endl; + cout << endl << "error with running 'columnstore restart' on local module " << endl; cout << endl << "**** restartSystem Failed" << endl; break; } @@ -2550,10 +2550,10 @@ int processCommand(string* arguments) //just kick off local server cout << " System being restarted, please wait..."; cout.flush(); - string cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << endl << "error with running 'infinidb start' on local module " << endl; + cout << endl << "error with running 'columnstore start' on local module " << endl; cout << endl << "**** restartSystem Failed" << endl; break; } @@ -3314,7 +3314,7 @@ int processCommand(string* arguments) string configFileName; oam.getSystemConfig("SystemLogConfigFile", configFileName); - cout << endl << "Calpont System Log Configuration Data" << endl << endl; + cout << endl << "MariDB Columnstore System Log Configuration Data" << endl << endl; cout << "System Logging Configuration File being used: " << configFileName << endl << endl; @@ -3382,9 +3382,9 @@ int processCommand(string* arguments) } //check the system status / service status and only allow command when System is MAN_OFFLINE - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (oam.checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) { SystemStatus systemstatus; try { @@ -3639,7 +3639,7 @@ int processCommand(string* arguments) BRM::DBRM dbrm; getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm); - cout << endl << "This command suspends the DDL/DML writes to the Calpont Database" << endl; + cout << endl << "This command suspends the DDL/DML writes to the MariDB Columnstore Database" << endl; try { @@ -3720,7 +3720,7 @@ int processCommand(string* arguments) break; } - // stop writes to Calpont Database + // stop writes to MariDB Columnstore Database oam.SuspendWrites(gracefulTemp, ackTemp); } catch (exception& e) @@ -3738,11 +3738,11 @@ int processCommand(string* arguments) case 33: // resumeDatabaseWrites { if ( arguments[1] != "y" ) { - if (confirmPrompt("This command resumes the DDL/DML writes to the Calpont Database")) + if (confirmPrompt("This command resumes the DDL/DML writes to the MariDB Columnstore Database")) break; } - // resume writes to Calpont Database + // resume writes to MariDB Columnstore Database try{ SystemProcessStatus systemprocessstatus; @@ -3767,7 +3767,7 @@ int processCommand(string* arguments) } } oam.setSystemStatus(ACTIVE); - cout << endl << "Resume Calpont Database Writes Request successfully completed" << endl; + cout << endl << "Resume MariDB Columnstore Database Writes Request successfully completed" << endl; } catch (exception& e) { @@ -3859,9 +3859,9 @@ int processCommand(string* arguments) } //check the system status / service status and only allow command when System is MAN_OFFLINE - string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log"; + string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") ) + if (!oam.checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) { cout << endl << "**** assignDbrootPmConfig Failed, System is down. Needs to be running" << endl; break; @@ -4331,7 +4331,7 @@ int processCommand(string* arguments) } catch(...) { - cout << "ERROR: Problem setting AmazonElasticModule in the Calpont System Configuration file" << endl; + cout << "ERROR: Problem setting AmazonElasticModule in the MariDB Columnstore System Configuration file" << endl; break; } @@ -4445,7 +4445,7 @@ int processCommand(string* arguments) } catch(...) { - cout << "ERROR: Problem setting AmazonElasticModule in the Calpont System Configuration file" << endl; + cout << "ERROR: Problem setting AmazonElasticModule in the MariDB Columnstore System Configuration file" << endl; break; } } @@ -4823,18 +4823,18 @@ int processCommand(string* arguments) break; } - case 47: // getCalpontSoftwareInfo + case 47: // getMariDB ColumnstoreSoftwareInfo { cout << endl; if ( rootUser) { - system("rpm -qi infinidb-platform > /tmp/calpont.txt 2>&1"); - if (oam.checkLogStatus("/tmp/calpont.txt", "Name")) - system("cat /tmp/calpont.txt"); + system("rpm -qi columnstore-platform > /tmp/columnstore.txt 2>&1"); + if (oam.checkLogStatus("/tmp/columnstore.txt", "Name")) + system("cat /tmp/columnstore.txt"); else { - system("dpkg -s calpont > /tmp/calpont.txt 2>&1"); - if (oam.checkLogStatus("/tmp/calpont.txt", "Status: install")) - system("cat /tmp/calpont.txt"); + system("dpkg -s columnstore > /tmp/columnstore.txt 2>&1"); + if (oam.checkLogStatus("/tmp/columnstore.txt", "Status: install")) + system("cat /tmp/columnstore.txt"); else { SystemSoftware systemsoftware; oam.getSystemSoftware(systemsoftware); @@ -5452,7 +5452,7 @@ int processCommand(string* arguments) if ( arguments[3] != "y") { cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl; - string warning = "This command does a remove a module from the Calpont System"; + string warning = "This command does a remove a module from the MariDB Columnstore System"; // confirm request if (confirmPrompt(warning)) break; @@ -5517,7 +5517,7 @@ int processCommand(string* arguments) if ( arguments[2] != "y") { cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl; - string warning = "This command does a stop and remove a module from the Calpont System"; + string warning = "This command does a stop and remove a module from the MariDB Columnstore System"; // confirm request if (confirmPrompt(warning)) break; @@ -6511,7 +6511,7 @@ int processCommand(string* arguments) { // confirm request if ( arguments[2] != "y" ) { - if (confirmPrompt("This command stops the processing of applications on a Module within the Calpont System")) + if (confirmPrompt("This command stops the processing of applications on a Module within the MariDB Columnstore System")) break; } } @@ -6630,7 +6630,7 @@ int processCommand(string* arguments) // confirm request if ( arguments[2] != "y" ) { - if (confirmPrompt("This command starts the processing of applications on a Module within the Calpont System")) + if (confirmPrompt("This command starts the processing of applications on a Module within the MariDB Columnstore System")) break; } @@ -6775,7 +6775,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { // give warning for Process-Monitor if ( arguments[1] == "ProcessManager" ) { - if (confirmPrompt("ProcessManager is the Interface for the Console and should only be removed as part of a Calpont Package installation")) + if (confirmPrompt("ProcessManager is the Interface for the Console and should only be removed as part of a MariDB Columnstore Package installation")) break; } else @@ -6783,7 +6783,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) if ( arguments[3] != "y" ) { getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm); // confirm request - if (confirmPrompt("This command stops the processing of an application on a Module within the Calpont System")) + if (confirmPrompt("This command stops the processing of an application on a Module within the MariDB Columnstore System")) break; } } @@ -6836,7 +6836,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm); // confirm request - if (confirmPrompt("This command restarts the processing of an application on a Module within the Calpont System")) + if (confirmPrompt("This command restarts the processing of an application on a Module within the MariDB Columnstore System")) break; try @@ -6899,7 +6899,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) string password = arguments[1]; if ( arguments[2] != "y") { cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl; - string warning = "This command stops the Processing of applications and reboots all modules within the Calpont System"; + string warning = "This command stops the Processing of applications and reboots all modules within the MariDB Columnstore System"; // confirm request if (confirmPrompt(warning)) break; @@ -6991,7 +6991,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) // close the log file writeLog("End of a command session!!!"); logFile.close(); - cout << endl << "Exiting the Calpont Command Console" << endl; + cout << endl << "Exiting the MariDB Columnstore Command Console" << endl; exit (0); } } @@ -7022,7 +7022,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) string password = arguments[2]; if ( arguments[3] != "y") { cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl; - string warning = "This command reboots a node within the Calpont System"; + string warning = "This command reboots a node within the MariDB Columnstore System"; // confirm request if (confirmPrompt(warning)) break; @@ -7061,7 +7061,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) // close the log file writeLog("End of a command session!!!"); logFile.close(); - cout << endl << "Exiting the Calpont Command Console" << endl; + cout << endl << "Exiting the MariDB Columnstore Command Console" << endl; exit (0); } } @@ -7095,7 +7095,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command stops the dbrm processes within the Calpont System")) + if (confirmPrompt("This command stops the dbrm processes within the MariDB Columnstore System")) break; } @@ -7129,7 +7129,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command restarts the dbrm processes within the Calpont System")) + if (confirmPrompt("This command restarts the dbrm processes within the MariDB Columnstore System")) break; } @@ -7163,7 +7163,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) } catch(...) { - cout << "ERROR: Problem getting systemStartupOffline from the Calpont System Configuration file" << endl; + cout << "ERROR: Problem getting systemStartupOffline from the MariDB Columnstore System Configuration file" << endl; return 1; } @@ -7195,7 +7195,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) } catch(...) { - cout << "ERROR: Problem setting systemStartupOffline in the Calpont System Configuration file" << endl; + cout << "ERROR: Problem setting systemStartupOffline in the MariDB Columnstore System Configuration file" << endl; exit(-1); } cout << endl << " Successful setting of systemStartupOffline to '" << systemStartupOffline << "'" << endl << endl; @@ -7206,7 +7206,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command stops the PrimProc processes within the Calpont System")) + if (confirmPrompt("This command stops the PrimProc processes within the MariDB Columnstore System")) break; } @@ -7240,7 +7240,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command restarts the PrimProc processes within the Calpont System")) + if (confirmPrompt("This command restarts the PrimProc processes within the MariDB Columnstore System")) break; } @@ -7260,7 +7260,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command stops the ExeMgr processes within the Calpont System")) + if (confirmPrompt("This command stops the ExeMgr processes within the MariDB Columnstore System")) break; } @@ -7294,7 +7294,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) { if ( arguments[1] != "y" ) { // confirm request - if (confirmPrompt("This command restarts the ExeMgr processes within the Calpont System")) + if (confirmPrompt("This command restarts the ExeMgr processes within the MariDB Columnstore System")) break; } @@ -7326,11 +7326,11 @@ int ProcessSupportCommand(int CommandID, std::string arguments[]) try { oam.distributeConfigFile(name); - cout << endl << " Successful Distribution of Calpont Config File" << endl << endl; + cout << endl << " Successful Distribution of MariDB Columnstore Config File" << endl << endl; } catch (exception& e) { - cout << endl << "**** Distribution of Calpont Config File Failed : " << e.what() << endl; + cout << endl << "**** Distribution of MariDB Columnstore Config File Failed : " << e.what() << endl; } } break; @@ -7954,7 +7954,7 @@ void printProcessStatus(std::string port) } } - cout << endl << "Calpont Process statuses" << endl << endl; + cout << endl << "MariDB Columnstore Process statuses" << endl << endl; cout << "Process Module Status Last Status Change Process ID" << endl; cout << "------------------ ------ --------------- ------------------------ ----------" << endl; try diff --git a/oamapps/mcsadmin/mcsadmin.kdevelop b/oamapps/mcsadmin/mcsadmin.kdevelop index 82517ab68..e8459441e 100644 --- a/oamapps/mcsadmin/mcsadmin.kdevelop +++ b/oamapps/mcsadmin/mcsadmin.kdevelop @@ -1,25 +1,25 @@ - + - - - dhill@srvhill04.calpont.com - $VERSION$ - KDevCustomProject - C++ - - - - - - mcsadmin - - - - + + dhill@srvhill04.calpont.com + $VERSION$ + KDevCustomProject + C++ + - - + + + mcsadmin + executable + + + + + + + + ada ada_bugs_gcc @@ -64,7 +64,7 @@ KDE Libraries (Doxygen) - + @@ -73,4 +73,29 @@ + + + + true + true + true + false + true + true + true + 250 + 400 + 250 + + + + + false + false + + + *.o,*.lo,CVS + false + + diff --git a/oamapps/mcsadmin/mcsadmin.kdevelop.filelist b/oamapps/mcsadmin/mcsadmin.kdevelop.filelist new file mode 100644 index 000000000..06152384f --- /dev/null +++ b/oamapps/mcsadmin/mcsadmin.kdevelop.filelist @@ -0,0 +1,4 @@ +# KDevelop Custom Project File List +Makefile +mcsadmin.cpp +mcsadmin.h diff --git a/oamapps/mcsadmin/mcsadmin.kdevelop.pcs b/oamapps/mcsadmin/mcsadmin.kdevelop.pcs new file mode 100644 index 000000000..1238a42ba Binary files /dev/null and b/oamapps/mcsadmin/mcsadmin.kdevelop.pcs differ diff --git a/utils/loggingcpp/loggingcpp.kdevses b/oamapps/mcsadmin/mcsadmin.kdevses similarity index 66% rename from utils/loggingcpp/loggingcpp.kdevses rename to oamapps/mcsadmin/mcsadmin.kdevses index c94251478..631cc8ecf 100644 --- a/utils/loggingcpp/loggingcpp.kdevses +++ b/oamapps/mcsadmin/mcsadmin.kdevses @@ -1,13 +1,10 @@ - - - + + + - - - diff --git a/oamapps/postConfigure/Doxyfile b/oamapps/postConfigure/Doxyfile new file mode 100644 index 000000000..ddb570a59 --- /dev/null +++ b/oamapps/postConfigure/Doxyfile @@ -0,0 +1,275 @@ +# Doxyfile 1.4.1-KDevelop + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = postConfigure.kdevelop +PROJECT_NUMBER = $VERSION$ +OUTPUT_DIRECTORY = +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = /home/dhill/InfiniDB_MariaDB/oamapps/mcsadmin/ +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = YES +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = /home/dhill/InfiniDB_MariaDB/oamapps/postConfigure +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.C \ + *.CC \ + *.C++ \ + *.II \ + *.I++ \ + *.H \ + *.HH \ + *.H++ \ + *.CS \ + *.PHP \ + *.PHP3 \ + *.M \ + *.MM \ + *.C \ + *.H \ + *.tlh \ + *.diff \ + *.patch \ + *.moc \ + *.xpm \ + *.dox +RECURSIVE = yes +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = YES +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = yes +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = postConfigure.tag +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 1000 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/oamapps/postConfigure/amazonInstaller.d.5996 b/oamapps/postConfigure/amazonInstaller.d.5996 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/amazonInstaller.d.6154 b/oamapps/postConfigure/amazonInstaller.d.6154 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/amazonInstaller.d.6264 b/oamapps/postConfigure/amazonInstaller.d.6264 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/amazonInstaller.d.6383 b/oamapps/postConfigure/amazonInstaller.d.6383 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/getMySQLpw.d.5982 b/oamapps/postConfigure/getMySQLpw.d.5982 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/getMySQLpw.d.6140 b/oamapps/postConfigure/getMySQLpw.d.6140 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/getMySQLpw.d.6250 b/oamapps/postConfigure/getMySQLpw.d.6250 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/getMySQLpw.d.6369 b/oamapps/postConfigure/getMySQLpw.d.6369 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index c169dbd71..7668dacd7 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2014 MariDB Columnstore, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -203,7 +203,7 @@ void dbrmDirCheck() cout << "If the files were copied from " << dbrmrootPrevDir << " to " << dbrmrootDir << endl; cout << "you will need to edit the file BRM_saves_current to contain the current path of" << endl; cout << dbrmrootDir << endl << endl; - cout << "Please reference the InfiniDB Installation Guide on Upgrade Installs for" << endl; + cout << "Please reference the MariDB Columnstore Installation Guide on Upgrade Installs for" << endl; cout << "addition information, if needed." << endl << endl; while(true) @@ -279,7 +279,7 @@ void mysqlSetup() } catch (...) { - cout << endl << "InfiniDB-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on local module" << endl; + cout << endl << "MariDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on local module" << endl; exit(1); } @@ -293,7 +293,7 @@ void mysqlSetup() } else { - if (!oam.checkLogStatus("/tmp/idbmysql.log", "InfiniDB") ) { + if (!oam.checkLogStatus("/tmp/idbmysql.log", "MariDB Columnstore") ) { cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; system("cat /tmp/idbmysql.log"); exit (1); @@ -388,7 +388,7 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum) returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 ); if ( returnStatus != API_SUCCESS) { - cout << "ERROR: Error return in running the InfiniDB Upgrade, check /tmp/upgrade*.logs on " << (*pt).DeviceName << endl; + cout << "ERROR: Error return in running the MariDB Columnstore Upgrade, check /tmp/upgrade*.logs on " << (*pt).DeviceName << endl; return returnStatus; } } @@ -742,7 +742,7 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig ) {} if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -864,7 +864,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string {} if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } diff --git a/oamapps/postConfigure/helpers.d.6024 b/oamapps/postConfigure/helpers.d.6024 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/helpers.d.6182 b/oamapps/postConfigure/helpers.d.6182 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/helpers.d.6292 b/oamapps/postConfigure/helpers.d.6292 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/helpers.d.6411 b/oamapps/postConfigure/helpers.d.6411 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/installer.d.6010 b/oamapps/postConfigure/installer.d.6010 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/installer.d.6168 b/oamapps/postConfigure/installer.d.6168 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/installer.d.6278 b/oamapps/postConfigure/installer.d.6278 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/installer.d.6397 b/oamapps/postConfigure/installer.d.6397 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/mycnfUpgrade.d.5989 b/oamapps/postConfigure/mycnfUpgrade.d.5989 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/mycnfUpgrade.d.6147 b/oamapps/postConfigure/mycnfUpgrade.d.6147 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/mycnfUpgrade.d.6257 b/oamapps/postConfigure/mycnfUpgrade.d.6257 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/mycnfUpgrade.d.6376 b/oamapps/postConfigure/mycnfUpgrade.d.6376 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/patchInstaller.d.6003 b/oamapps/postConfigure/patchInstaller.d.6003 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/patchInstaller.d.6161 b/oamapps/postConfigure/patchInstaller.d.6161 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/patchInstaller.d.6271 b/oamapps/postConfigure/patchInstaller.d.6271 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/patchInstaller.d.6390 b/oamapps/postConfigure/patchInstaller.d.6390 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index 3be0397b1..9dfd2ad6c 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2014 MariDB Columnstore, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -268,8 +268,8 @@ int main(int argc, char *argv[]) { if( string("-h") == argv[i] ) { cout << endl; - cout << "This is the InfiniDB System Configuration and Installation tool." << endl; - cout << "It will Configure the InfiniDB System based on Operator inputs and" << endl; + cout << "This is the MariDB Columnstore System Configuration and Installation tool." << endl; + cout << "It will Configure the MariDB Columnstore System based on Operator inputs and" << endl; cout << "will perform a Package Installation of all of the Modules within the" << endl; cout << "System that is being configured." << endl; cout << endl; @@ -383,8 +383,8 @@ int main(int argc, char *argv[]) oldFileName = installDir + "/etc/Calpont.xml.rpmsave"; cout << endl; - cout << "This is the InfiniDB System Configuration and Installation tool." << endl; - cout << "It will Configure the InfiniDB System and will perform a Package" << endl; + cout << "This is the MariDB Columnstore System Configuration and Installation tool." << endl; + cout << "It will Configure the MariDB Columnstore System and will perform a Package" << endl; cout << "Installation of all of the Servers within the System that is being configured." << endl; cout << endl; @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm); string currentDate = timestamp; - string postConfigureLog = "/var/log/infinidb-postconfigure-" + currentDate; + string postConfigureLog = "/var/log/columnstore-postconfigure-" + currentDate; cout << "With the no-Prompting Option being specified, you will be required to have the following:" << endl; cout << endl; @@ -423,11 +423,11 @@ int main(int argc, char *argv[]) // redirectStandardOutputToFile(postConfigureLog, false ); } - //check if InfiniDB is up and running - string cmd = installDir + "/bin/infinidb status > /tmp/status.log"; + //check if MariDB Columnstore is up and running + string cmd = installDir + "/bin/columnstore status > /tmp/status.log"; system(cmd.c_str()); - if (oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") ) { - cout << "InfiniDB is running, can't run postConfigure while InfiniDB is running. Exiting.." << endl; + if (oam.checkLogStatus("/tmp/status.log", "MariDB Columnstore is running") ) { + cout << "MariDB Columnstore is running, can't run postConfigure while MariDB Columnstore is running. Exiting.." << endl; exit (0); } @@ -585,7 +585,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot Count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot Count in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -603,11 +603,11 @@ int main(int argc, char *argv[]) checkMysqlPort(mysqlPort, sysConfig); if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } - cout << endl << "===== Performing Configuration Setup and InfiniDB Startup =====" << endl; + cout << endl << "===== Performing Configuration Setup and MariDB Columnstore Startup =====" << endl; cmd = installDir + "/bin/installer dummy.rpm dummy.rpm dummy.rpm dummy.rpm dummy.rpm initial dummy " + reuseConfig + " --nodeps ' ' 1 " + installDir; system(cmd.c_str()); @@ -634,12 +634,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting SingleServerInstall from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting SingleServerInstall from the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -665,7 +665,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem getting ServerTypeInstall from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem getting ServerTypeInstall from the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -696,7 +696,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting ServerTypeInstall in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ServerTypeInstall in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -705,7 +705,7 @@ int main(int argc, char *argv[]) { cout << "Combined Server Installation will be performed." << endl; cout << "The Server will be configured as a Performance Module." << endl; - cout << "All InfiniDB Processes will run on the Performance Modules." << endl << endl; + cout << "All MariDB Columnstore Processes will run on the Performance Modules." << endl << endl; //module ProcessConfig.xml to setup all apps on the dm if( !updateProcessConfig(IserverTypeInstall) ) @@ -758,7 +758,7 @@ int main(int argc, char *argv[]) string answer = "n"; cout << "NOTE: Local Query Feature allows the ability to query data from a single Performance" << endl; - cout << " Module. Check InfiniDB Admin Guide for additional information." << endl << endl; + cout << " Module. Check MariDB Columnstore Admin Guide for additional information." << endl << endl; while(true) { if ( pmwithum ) @@ -818,7 +818,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -858,7 +858,7 @@ int main(int argc, char *argv[]) cout << "You have 2 install options: " << endl << endl; cout << "1. Utilizing the Amazon IDs for instances and volumes which allows for features like" << endl; cout << "automaticly launching instances and EBS volumes when configuring and system expansion." << endl; - cout << "This option is recommended and would be use if you are setting up a InfiniDB system." << endl << endl; + cout << "This option is recommended and would be use if you are setting up a MariDB Columnstore system." << endl << endl; cout << "2. Using standard hardware IDs for hostnames, IP Addresses, and Storage Devices." << endl; cout << "Using this option, you would need to pre-create the Instances and the EBS storages" << endl; cout << "and then provide the hostnames/IP-Addresses during the configuration and system expansion" << endl; @@ -995,7 +995,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1052,12 +1052,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting InitialInstallFlag from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting InitialInstallFlag from the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1089,7 +1089,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting ParentOAMModuleName the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ParentOAMModuleName the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1100,7 +1100,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting ParentStandbyOAMModuleName the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ParentStandbyOAMModuleName the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1134,7 +1134,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem reading the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem reading the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1188,7 +1188,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting NumBlocksPct in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting NumBlocksPct in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1205,12 +1205,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting TotalUmMemory in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting TotalUmMemory in the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1231,7 +1231,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1262,7 +1262,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting NumBlocksPct in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting NumBlocksPct in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1278,12 +1278,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting TotalUmMemory in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting TotalUmMemory in the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1303,7 +1303,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1317,12 +1317,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting InitialInstallFlag from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting InitialInstallFlag from the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1390,7 +1390,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting Module Count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting Module Count in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1435,7 +1435,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting Module Count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting Module Count in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -1580,7 +1580,7 @@ int main(int argc, char *argv[]) else { string enable = "y"; - cout << "Module '" + newModuleName + "' is Disabled. It needs to be enabled to startup InfiniDB." << endl; + cout << "Module '" + newModuleName + "' is Disabled. It needs to be enabled to startup MariDB Columnstore." << endl; prompt = "Do you want to Enable it or exit? [y,exit] (y) > "; pcommand = callReadline(prompt.c_str()); if (pcommand) @@ -1621,12 +1621,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting ModuleDisableState in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ModuleDisableState in the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1819,7 +1819,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting Host Name in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting Host Name in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -1932,7 +1932,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting IP address in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting IP address in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2067,7 +2067,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2182,12 +2182,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting Volume/Device Names in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting Volume/Device Names in the MariDB Columnstore System Configuration file" << endl; return false; } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2221,7 +2221,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot count in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2248,7 +2248,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot ID in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot ID in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -2426,7 +2426,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot ID in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot ID in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2438,7 +2438,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -2562,12 +2562,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting Volume/Device Names in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting Volume/Device Names in the MariDB Columnstore System Configuration file" << endl; return false; } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2586,7 +2586,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot count in the MariDB Columnstore System Configuration file" << endl; exit(1); } //total dbroots on the system @@ -2594,7 +2594,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2611,7 +2611,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2622,7 +2622,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting DBRoot Count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot Count in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2638,7 +2638,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting ConnectionsPerPrimProc in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ConnectionsPerPrimProc in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2693,7 +2693,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2713,7 +2713,7 @@ int main(int argc, char *argv[]) } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2722,7 +2722,7 @@ int main(int argc, char *argv[]) if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM && pmNumber == 1) { //run the mysql / mysqld setup scripts - cout << endl << "===== Running the InfiniDB MySQL setup scripts =====" << endl << endl; + cout << endl << "===== Running the MariDB Columnstore MySQL setup scripts =====" << endl << endl; checkMysqlPort(mysqlPort, sysConfig); @@ -2788,7 +2788,7 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem getting EEPackageType from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem getting EEPackageType from the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2810,13 +2810,13 @@ int main(int argc, char *argv[]) } if ( EEPackageType == "rpm" ) - cout << "Performing an InfiniDB System install using RPM packages located in the " + HOME + " directory." << endl; + cout << "Performing an MariDB Columnstore System install using RPM packages located in the " + HOME + " directory." << endl; else { if ( EEPackageType == "binary" ) - cout << "Performing an InfiniDB System install using a Binary package located in the " + HOME + " directory." << endl; + cout << "Performing an MariDB Columnstore System install using a Binary package located in the " + HOME + " directory." << endl; else - cout << "Performing an InfiniDB System install using using DEB packages located in the " + HOME + " directory." << endl; + cout << "Performing an MariDB Columnstore System install using using DEB packages located in the " + HOME + " directory." << endl; } //Write out Updated System Configuration File @@ -2825,12 +2825,12 @@ int main(int argc, char *argv[]) } catch(...) { - cout << "ERROR: Problem setting EEPackageType from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting EEPackageType from the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -2840,11 +2840,11 @@ int main(int argc, char *argv[]) string separator = "-"; if ( EEPackageType == "deb" ) separator = "_"; - calpontPackage1 = "infinidb-platform" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - calpontPackage2 = "infinidb-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - calpontPackage3 = "infinidb-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - mysqlPackage = "infinidb-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - mysqldPackage = "infinidb-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-platform" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage2 = "mariadb-columnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage3 = "mariadb-columnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + mysqlPackage = "mariadb-columnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + mysqldPackage = "mariadb-columnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release; if( !pkgCheck() ) { exit(1); @@ -2852,7 +2852,7 @@ int main(int argc, char *argv[]) else { //mariadb - calpontPackage1 = "infinidb-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release; calpontPackage1 = HOME + "/" + calpontPackage1 + "*." + EEPackageType; calpontPackage2 = HOME + "/" + calpontPackage2 + "*." + EEPackageType; @@ -2867,9 +2867,9 @@ int main(int argc, char *argv[]) string fileName = installDir + "/bin/healthcheck"; ifstream file (fileName.c_str()); if (!file) // CE - calpontPackage1 = "infinidb-" + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-" + systemsoftware.Version + "-" + systemsoftware.Release; else // EE - calpontPackage1 = "infinidb-ent-" + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-ent-" + systemsoftware.Version + "-" + systemsoftware.Release; calpontPackage2 = "dummy"; calpontPackage3 = "dummy"; mysqlPackage = calpontPackage1; @@ -2944,7 +2944,7 @@ int main(int argc, char *argv[]) if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) || ( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) ) { - cout << endl << "===== Running the InfiniDB MySQL setup scripts =====" << endl << endl; + cout << endl << "===== Running the MariDB Columnstore MySQL setup scripts =====" << endl << endl; // call the mysql setup scripts mysqlSetup(); @@ -3034,7 +3034,7 @@ int main(int argc, char *argv[]) cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1"; rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << endl << "InfiniDB-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl; + cout << endl << "MariDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl; exit(1); } @@ -3050,13 +3050,13 @@ int main(int argc, char *argv[]) cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1"; rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << endl << "InfiniDB-MySQL login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl; + cout << endl << "MariDB Columnstore-MySQL login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl; exit(1); } } else { - if (!oam.checkLogStatus("/tmp/idbmysql.log", "InfiniDB") ) { + if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) { cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; system("cat /tmp/idbmysql.log"); exit (1); @@ -3201,7 +3201,7 @@ int main(int argc, char *argv[]) if ( thread_remote_installer ) { //wait until remove install Thread Count is at zero or hit timeout - cout << endl << "InfiniDB Package being installed, please wait ..."; + cout << endl << "MariDB Columnstore Package being installed, please wait ..."; cout.flush(); /* block until all threads complete */ @@ -3226,7 +3226,7 @@ int main(int argc, char *argv[]) while(true) { - pcommand = callReadline("Would you like to configure InfiniDB GlusterFS Data Redundancy? [y,n] (" + start + ") > "); + pcommand = callReadline("Would you like to configure MariDB Columnstore GlusterFS Data Redundancy? [y,n] (" + start + ") > "); if (pcommand) { if (strlen(pcommand) > 0) start = pcommand; @@ -3242,7 +3242,7 @@ int main(int argc, char *argv[]) } if ( start == "y" ) { - cout << endl << "===== Configuring InfiniDB Data Redundancy Functionality =====" << endl << endl; + cout << endl << "===== Configuring MariDB Columnstore Data Redundancy Functionality =====" << endl << endl; int ret = system(glusterconfig.c_str()); if ( WEXITSTATUS(ret) != 0 ) { @@ -3260,12 +3260,12 @@ int main(int argc, char *argv[]) {} if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } - //check if local InfiniDB system logging is working - cout << endl << "===== Checking InfiniDB System Logging Functionality =====" << endl << endl; + //check if local MariDB Columnstore system logging is working + cout << endl << "===== Checking MariDB Columnstore System Logging Functionality =====" << endl << endl; if ( rootUser) cmd = installDir + "/bin/syslogSetup.sh install > /dev/null 2>&1"; @@ -3281,29 +3281,29 @@ int main(int argc, char *argv[]) int ret = system(cmd.c_str()); if ( WEXITSTATUS(ret) != 0) - cerr << "WARNING: The InfiniDB system logging not correctly setup and working" << endl; + cerr << "WARNING: The MariDB Columnstore system logging not correctly setup and working" << endl; else - cout << "The InfiniDB system logging is setup and working on local server" << endl; + cout << "The MariDB Columnstore system logging is setup and working on local server" << endl; - cout << endl << "InfiniDB System Configuration and Installation is Completed" << endl; + cout << endl << "MariDB Columnstore System Configuration and Installation is Completed" << endl; // - // startup infinidb + // startup MariDB Columnstore // if ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM || pmNumber > 1 ) { // - // perform InfiniDB system startup + // perform MariDB Columnstore system startup // - cout << endl << "===== Infinidb System Startup =====" << endl << endl; + cout << endl << "===== MariDB Columnstore System Startup =====" << endl << endl; string start = "y"; cout << "System Installation is complete. If any part of the install failed," << endl; cout << "the problem should be investigated and resolved before continuing." << endl << endl; while(true) { - pcommand = callReadline("Would you like to startup the InfiniDB System? [y,n] (y) > "); + pcommand = callReadline("Would you like to startup the MariDB Columnstore System? [y,n] (y) > "); if (pcommand) { if (strlen(pcommand) > 0) start = pcommand; @@ -3322,11 +3322,11 @@ int main(int argc, char *argv[]) if (hdfs) { - cout << endl << "----- Starting InfiniDB Service on all Modules -----" << endl << endl; - string cmd = "pdsh -a '" + installDir + "/bin/infinidb restart' > /tmp/postConfigure.pdsh 2>&1"; + cout << endl << "----- Starting MariDB Columnstore Service on all Modules -----" << endl << endl; + string cmd = "pdsh -a '" + installDir + "/bin/columnstore restart' > /tmp/postConfigure.pdsh 2>&1"; system(cmd.c_str()); if (oam.checkLogStatus("/tmp/postConfigure.pdsh", "exit") ) { - cout << endl << "ERROR: Starting InfiniDB Service failue, check /tmp/postConfigure.pdsh. exit..." << endl; + cout << endl << "ERROR: Starting MariDB Columnstore Service failue, check /tmp/postConfigure.pdsh. exit..." << endl; exit (1); } } @@ -3383,50 +3383,50 @@ int main(int argc, char *argv[]) string remoteHostName = (*list1).hostName; //run remote command script - cout << endl << "----- Starting InfiniDB on '" + remoteModuleName + "' -----" << endl << endl; + cout << endl << "----- Starting MariDB Columnstore on '" + remoteModuleName + "' -----" << endl << endl; cmd = installDir + "/bin/remote_scp_put.sh " + remoteModuleIP + " " + installDir + "/etc/Calpont.xml " + installDir + "/etc/. > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + - " '" + installDir + "/bin/infinidb restart' 0"; + " '" + installDir + "/bin/columnstore restart' 0"; rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) cout << "Error with running remote_command.sh" << endl; else - cout << "InfiniDB successfully started" << endl; + cout << "MariDB Columnstore successfully started" << endl; } - //start InfiniDB on local server - cout << endl << "----- Starting InfiniDB on local server -----" << endl << endl; - cmd = installDir + "/bin/infinidb restart > /dev/null 2>&1"; + //start MariDB Columnstore on local server + cout << endl << "----- Starting MariDB Columnstore on local server -----" << endl << endl; + cmd = installDir + "/bin/columnstore restart > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << "Error Starting InfiniDB local module" << endl; + cout << "Error Starting MariDB Columnstore local module" << endl; cout << "Installation Failed, exiting" << endl; exit (1); } else - cout << "InfiniDB successfully started" << endl; + cout << "MariDB Columnstore successfully started" << endl; } } else { - cout << endl << "You choose not to Start the InfiniDB Software at this time." << endl; + cout << endl << "You choose not to Start the MariDB Columnstore Software at this time." << endl; exit (1); } } else // Single Server start { - cout << endl << "===== InfiniDB System Startup =====" << endl << endl; + cout << endl << "===== MariDB Columnstore System Startup =====" << endl << endl; string start = "y"; cout << "System Installation is complete." << endl; - cout << "If an error occurred while running the InfiniDB MySQL setup scripts," << endl; + cout << "If an error occurred while running the MariDB Columnstore MySQL setup scripts," << endl; cout << "this will need to be corrected and postConfigure will need to be re-run." << endl << endl; while(true) { - pcommand = callReadline("Would you like to startup the InfiniDB System? [y,n] (y) > "); + pcommand = callReadline("Would you like to startup the MariDB Columnstore System? [y,n] (y) > "); if (pcommand) { if (strlen(pcommand) > 0) start = pcommand; @@ -3442,26 +3442,26 @@ int main(int argc, char *argv[]) } if ( start == "y" ) { - //start InfiniDB on local server - cout << endl << "----- Starting InfiniDB on local Server '" + parentOAMModuleName + "' -----" << endl << endl; - string cmd = installDir + "/bin/infinidb restart > /dev/null 2>&1"; + //start MariDB Columnstore on local server + cout << endl << "----- Starting MariDB Columnstore on local Server '" + parentOAMModuleName + "' -----" << endl << endl; + string cmd = installDir + "/bin/columnstore restart > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << "Error Starting InfiniDB local module" << endl; + cout << "Error Starting MariDB Columnstore local module" << endl; cout << "Installation Failed, exiting" << endl; exit (1); } else - cout << endl << "InfiniDB successfully started" << endl; + cout << endl << "MariDB Columnstore successfully started" << endl; } else { - cout << endl << "You choose not to Start the InfiniDB Software at this time." << endl; + cout << endl << "You choose not to Start the MariDB Columnstore Software at this time." << endl; exit (1); } } - cout << endl << "InfiniDB Database Platform Starting, please wait ."; + cout << endl << "MariDB Columnstore Database Platform Starting, please wait ."; cout.flush(); if ( waitForActive() ) { @@ -3487,7 +3487,7 @@ int main(int argc, char *argv[]) // int status = sendUpgradeRequest(IserverTypeInstall, pmwithum); // if ( status != 0 ) { -// cout << endl << "InfiniDB Install Failed" << endl << endl; +// cout << endl << "MariDB Columnstore Install Failed" << endl << endl; // exit(1); // } // else @@ -3513,26 +3513,26 @@ int main(int argc, char *argv[]) int status = sendReplicationRequest(IserverTypeInstall, password, mysqlPort, pmwithum); if ( status != 0 ) { - cout << endl << " InfiniDB Install Failed" << endl << endl; + cout << endl << " MariDB Columnstore Install Failed" << endl << endl; exit(1); } else cout << " DONE" << endl; } - cout << endl << "InfiniDB Install Successfully Completed, System is Active" << endl << endl; + cout << endl << "MariDB Columnstore Install Successfully Completed, System is Active" << endl << endl; - cout << "Enter the following command to define InfiniDB Alias Commands" << endl << endl; + cout << "Enter the following command to define MariDB Columnstore Alias Commands" << endl << endl; cout << ". " + installDir + "/bin/calpontAlias" << endl << endl; - cout << "Enter 'idbmysql' to access the InfiniDB MySQL console" << endl; - cout << "Enter 'cc' to access the InfiniDB System Management console" << endl << endl; + cout << "Enter 'mcsmysql' to access the MariDB Columnstore MySQL console" << endl; + cout << "Enter 'mcsadmin' to access the MariDB Columnstore Admin console" << endl << endl; } else { cout << " FAILED" << endl; - cout << endl << "InfiniDB System failed to start, check log files in /var/log/Columnstore" << endl; + cout << endl << "MariDB Columnstore System failed to start, check log files in /var/log/Columnstore" << endl; exit(1); } @@ -3590,14 +3590,14 @@ bool checkSaveConfigFile() singleServerInstall = "2"; if ( !noPrompting ) { - cout << endl << "A copy of the InfiniDB Configuration file has been saved during Package install." << endl; + cout << endl << "A copy of the MariDB Columnstore Configuration file has been saved during Package install." << endl; if ( singleServerInstall == "1") cout << "It's Configured for a Single Server Install." << endl; else cout << "It's Configured for a Multi-Server Install." << endl; cout << "You have an option of utilizing the configuration data from that file or starting" << endl; - cout << "with the InfiniDB Configuration File that comes with the InfiniDB Package." << endl; + cout << "with the MariDB Columnstore Configuration File that comes with the MariDB Columnstore Package." << endl; cout << "You will only want to utilize the old configuration data when performing the same" << endl; cout << "type of install, i.e. Single or Multi-Server" << endl; } @@ -4159,7 +4159,7 @@ bool pkgCheck() while(true) { - pcommand = callReadline("Please place a copy of the InfiniDB Packages in directory " + HOME + " and press to continue or enter 'exit' to exit the install > "); + pcommand = callReadline("Please place a copy of the MariDB Columnstore Packages in directory " + HOME + " and press to continue or enter 'exit' to exit the install > "); if (pcommand) { if (strcmp(pcommand, "exit") == 0) { @@ -4193,7 +4193,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem getting DB Storage Data from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem getting DB Storage Data from the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4246,7 +4246,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFilePlugin in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFilePlugin in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4255,12 +4255,12 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFileEnvFile in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFileEnvFile in the MariDB Columnstore System Configuration file" << endl; return false; } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; return false; } @@ -4316,7 +4316,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem getting UM DB Storage Data from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem getting UM DB Storage Data from the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4382,7 +4382,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting UMVolumeType in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting UMVolumeType in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4428,7 +4428,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting UMVolumeSize in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting UMVolumeSize in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4474,7 +4474,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting UMVolumeIOPS in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting UMVolumeIOPS in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4485,7 +4485,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting UMStorageType in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting UMStorageType in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4496,7 +4496,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting UMStorageType in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting UMStorageType in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4664,7 +4664,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DBRootStorageType in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRootStorageType in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4715,7 +4715,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting PMVolumeType in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting PMVolumeType in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4761,7 +4761,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting PMVolumeSize in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting PMVolumeSize in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4807,7 +4807,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting PMVolumeIOPS in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting PMVolumeIOPS in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4818,7 +4818,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting PMVolumeSize in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting PMVolumeSize in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4911,7 +4911,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFilePlugin in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFilePlugin in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4920,7 +4920,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFileEnvFile in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFileEnvFile in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4929,7 +4929,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFileLog in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFileLog in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4938,7 +4938,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting ExtentsPerSegmentFile in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting ExtentsPerSegmentFile in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -4951,7 +4951,7 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFilePlugin in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFilePlugin in the MariDB Columnstore System Configuration file" << endl; return false; } @@ -4960,18 +4960,18 @@ bool storageSetup(bool amazonInstall) } catch(...) { - cout << "ERROR: Problem setting DataFileEnvFile in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DataFileEnvFile in the MariDB Columnstore System Configuration file" << endl; return false; } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; return false; } } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; return false; } @@ -4982,13 +4982,13 @@ void snmpAppCheck() { Oam oam; - cout << endl << "===== InfiniDB SNMP-Trap Process Check =====" << endl << endl; - cout << "InfiniDB is packaged with an SNMP-Trap process." << endl; - cout << "If the system where InfiniDB is being installed already has an SNMP-Trap process" << endl; - cout << "running, then you have the option of disabling InfiniDB's SNMP-Trap process." << endl; - cout << "Not having the InfiniDB SNMP-Trap process will affect the" << endl; - cout << "generation of InfiniDB alarms and associated SNMP traps." << endl; - cout << "Please reference the InfiniDB Installation Guide for" << endl; + cout << endl << "===== MariDB Columnstore SNMP-Trap Process Check =====" << endl << endl; + cout << "MariDB Columnstore is packaged with an SNMP-Trap process." << endl; + cout << "If the system where MariDB Columnstore is being installed already has an SNMP-Trap process" << endl; + cout << "running, then you have the option of disabling MariDB Columnstore's SNMP-Trap process." << endl; + cout << "Not having the MariDB Columnstore SNMP-Trap process will affect the" << endl; + cout << "generation of MariDB Columnstore alarms and associated SNMP traps." << endl; + cout << "Please reference the MariDB Columnstore Installation Guide for" << endl; cout << "additional information." << endl << endl; string enableSNMP = "y"; @@ -5004,7 +5004,7 @@ void snmpAppCheck() { if ( enableSNMP == "y" ) { string disable = "n"; - pcommand = callReadline("InfiniDB SNMP-Trap process is enabled, would you like to disable it [y,n] (n) > "); + pcommand = callReadline("MariDB Columnstore SNMP-Trap process is enabled, would you like to disable it [y,n] (n) > "); if (pcommand) { if (strlen(pcommand) > 0) disable = pcommand; @@ -5027,7 +5027,7 @@ void snmpAppCheck() else { string enable = "n"; - pcommand = callReadline("InfiniDB SNMP-Trap process is disabled, would you like to enable it (y,n) [n] > "); + pcommand = callReadline("MariDB Columnstore SNMP-Trap process is disabled, would you like to enable it (y,n) [n] > "); if (pcommand) { if (strlen(pcommand) > 0) enable = pcommand; @@ -5056,7 +5056,7 @@ void snmpAppCheck() oam.setProcessConfig("SNMPTrapDaemon", "ParentOAMModule", "BootLaunch", "1"); oam.setProcessConfig("SNMPTrapDaemon", "ParentOAMModule", "LaunchID", "3"); - cout << endl << "InfiniDB SNMP Process successfully enabled" << endl; + cout << endl << "MariDB Columnstore SNMP Process successfully enabled" << endl; } catch (exception& e) { @@ -5077,7 +5077,7 @@ void snmpAppCheck() cout << endl << "===== Setup the Network Management System (NMS) Server Configuration =====" << endl << endl; - cout << "This would be used to receive SNMP Traps from InfiniDB." << endl; + cout << "This would be used to receive SNMP Traps from MariDB Columnstore." << endl; cout << "0.0.0.0 defaults to not sending off the system" << endl << endl; prompt = "Enter IP Address(es) of where you want the SNMP Traps went (" + currentNMSIPAddress + ") > "; pcommand = callReadline(prompt.c_str()); @@ -5096,7 +5096,7 @@ void snmpAppCheck() oam.setProcessConfig("SNMPTrapDaemon", "ParentOAMModule", "BootLaunch", "0"); oam.setProcessConfig("SNMPTrapDaemon", "ParentOAMModule", "LaunchID", "0"); - cout << endl << "InfiniDB SNMP-Trap Process successfully disabled" << endl; + cout << endl << "MariDB Columnstore SNMP-Trap Process successfully disabled" << endl; } catch (exception& e) { @@ -5105,7 +5105,7 @@ void snmpAppCheck() } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -5140,12 +5140,12 @@ void setSystemName() } catch(...) { - cout << "ERROR: Problem setting SystemName from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting SystemName from the MariDB Columnstore System Configuration file" << endl; exit(1); } if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -5209,10 +5209,10 @@ bool updateBash() if (!rootUser) { - string cmd = "echo export INFINIDB_INSTALL_DIR=" + installDir + " >> " + fileName; + string cmd = "echo export columnstore_INSTALL_DIR=" + installDir + " >> " + fileName; system(cmd.c_str()); - cmd = "echo export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql >> " + fileName; + cmd = "echo export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$columnstore_INSTALL_DIR/lib:$columnstore_INSTALL_DIR/mysql/lib/mysql >> " + fileName; system(cmd.c_str()); } @@ -5246,7 +5246,7 @@ void offLineAppCheck() } catch(...) { - cout << "ERROR: Problem getting systemStartupOffline from the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem getting systemStartupOffline from the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -5280,7 +5280,7 @@ void offLineAppCheck() } catch(...) { - cout << "ERROR: Problem setting systemStartupOffline in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting systemStartupOffline in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -5366,7 +5366,7 @@ bool singleServerDBrootSetup() } catch(...) { - cout << "ERROR: Problem setting DBRoot count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot count in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -5389,7 +5389,7 @@ bool singleServerDBrootSetup() } catch(...) { - cout << "ERROR: Problem setting DBRoot ID in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot ID in the MariDB Columnstore System Configuration file" << endl; exit(1); } } @@ -5463,7 +5463,7 @@ bool singleServerDBrootSetup() } catch(...) { - cout << "ERROR: Problem setting DBRoot ID in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot ID in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -5475,7 +5475,7 @@ bool singleServerDBrootSetup() } catch(...) { - cout << "ERROR: Problem setting DBRoot in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot in the MariDB Columnstore System Configuration file" << endl; return false; } } @@ -5487,7 +5487,7 @@ bool singleServerDBrootSetup() } catch(...) { - cout << "ERROR: Problem setting DBRoot count in the InfiniDB System Configuration file" << endl; + cout << "ERROR: Problem setting DBRoot count in the MariDB Columnstore System Configuration file" << endl; exit(1); } @@ -5495,7 +5495,7 @@ bool singleServerDBrootSetup() DBRootCount = DBRootCount + dbroots.size(); if ( !writeConfig(sysConfig) ) { - cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl; + cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl; exit(1); } diff --git a/oamapps/postConfigure/postConfigure.d.6017 b/oamapps/postConfigure/postConfigure.d.6017 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/postConfigure.d.6175 b/oamapps/postConfigure/postConfigure.d.6175 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/postConfigure.d.6285 b/oamapps/postConfigure/postConfigure.d.6285 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/postConfigure.d.6404 b/oamapps/postConfigure/postConfigure.d.6404 new file mode 100644 index 000000000..e69de29bb diff --git a/oamapps/postConfigure/postConfigure.kdevelop b/oamapps/postConfigure/postConfigure.kdevelop new file mode 100644 index 000000000..03bd5fa07 --- /dev/null +++ b/oamapps/postConfigure/postConfigure.kdevelop @@ -0,0 +1,76 @@ + + + + + dhill@srvhill04.calpont.com + $VERSION$ + KDevCustomProject + C++ + + + + + + postConfigure + + + + + + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + kde2book + opengl + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + qt-kdev3 + ruby + ruby_bugs + sdl + sw + w3c-dom-level2-html + w3c-svg + w3c-uaag10 + wxwidgets_bugs + + + Guide to the Qt Translation Tools + Qt Assistant Manual + Qt Designer Manual + Qt Reference Documentation + qmake User Guide + + + KDE Libraries (Doxygen) + + + + + + + + + + + diff --git a/utils/loggingcpp/loggingcpp.kdevelop.pcs b/utils/loggingcpp/loggingcpp.kdevelop.pcs index 5e5b9955a..5017ac443 100644 Binary files a/utils/loggingcpp/loggingcpp.kdevelop.pcs and b/utils/loggingcpp/loggingcpp.kdevelop.pcs differ