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

name changes

Browse Source
This commit is contained in:
david hill
2016-05-12 17:33:10 -05:00
parent 2d2add3c4f
commit 4c8dae969d
58 changed files with 755 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
oam/install_scripts/binary_installer.sh
View File

@ -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"

16
oam/install_scripts/calpontSyslog-ng
View File

@ -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);
};

2
oam/install_scripts/calpontSyslog7
View File

@ -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

4
oam/install_scripts/columnstore
View File

@ -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

2
oam/install_scripts/columnstore.def
View File

@ -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

2
oam/install_scripts/columnstoreLogRotate
View File

@ -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
#

2
oam/install_scripts/columnstoreSyslog
View File

@ -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

2
oam/install_scripts/columnstoreSyslog7
View File

@ -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

2
oam/install_scripts/crontab
View File

@ -1,5 +1,5 @@
#
# Calpont version with Daily running at midnight
# MariaDB Columnstore version with Daily running at midnight
#
SHELL=/bin/bash

BIN
oam/install_scripts/install_scripts.kdevelop.pcs
View File

Binary file not shown.

27
oam/install_scripts/install_scripts.kdevses
View File

@ -1,31 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="8" >
<Doc0 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/binary_installer.sh" >
<DocsAndViews NumberOfDocuments="1" >
<Doc0 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/columnstoreSyslog" >
<View0 line="0" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/syslogSetup.sh" >
<View0 line="37" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/module_installer.sh" >
<View0 line="99" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/post-install" >
<View0 line="82" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/remote_installer.sh" >
<View0 line="24" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/pre-uninstall" >
<View0 line="5" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/Makefile" >
<View0 line="13" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/install_scripts/columnstore" >
<View0 line="179" Type="Source" />
</Doc7>
</DocsAndViews>
<pluginList>
<kdevdebugger>

18
oam/install_scripts/performance_installer.sh
View File

@ -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 {

8
oam/install_scripts/post-install
View File

@ -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

10
oam/install_scripts/post-mysql-install
View File

@ -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;
}

2
oam/install_scripts/post-mysqld-install
View File

@ -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

8
oam/install_scripts/pre-uninstall
View File

@ -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

2
oam/install_scripts/run.sh
View File

@ -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

2
oam/install_scripts/startupTests.sh
View File

@ -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

22
oam/install_scripts/syslogSetup.sh
View File

@ -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
}

16
oam/install_scripts/user_installer.sh
View File

@ -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 {

198
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -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 <Ctrl>-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

35
oamapps/mcsadmin/mcsadmin.kdevelop
View File

@ -1,22 +1,22 @@
<?xml version="1.0"?>
<?xml version = '1.0'?>
<kdevelop>
<general>
<author></author>
<author/>
<email>dhill@srvhill04.calpont.com</email>
<version>$VERSION$</version>
<projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts>
</ignoreparts>
<ignoreparts/>
</general>
<kdevcustomproject>
<run>
<mainprogram>mcsadmin</mainprogram>
<directoryradio>executable</directoryradio>
</run>
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell></dbgshell>
<dbgshell/>
</general>
</kdevdebugger>
<kdevdoctreeview>
@ -73,4 +73,29 @@
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
<kdevcppsupport>
<references/>
<codecompletion>
<includeGlobalFunctions>true</includeGlobalFunctions>
<includeTypes>true</includeTypes>
<includeEnums>true</includeEnums>
<includeTypedefs>false</includeTypedefs>
<automaticCodeCompletion>true</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<codeCompletionDelay>250</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<headerCompletionDelay>250</headerCompletionDelay>
</codecompletion>
</kdevcppsupport>
<kdevfileview>
<groups>
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidenonlocation>false</hidenonlocation>
</groups>
<tree>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
<hidenonprojectfiles>false</hidenonprojectfiles>
</tree>
</kdevfileview>
</kdevelop>

4
oamapps/mcsadmin/mcsadmin.kdevelop.filelist Normal file
View File

@ -0,0 +1,4 @@
# KDevelop Custom Project File List
Makefile
mcsadmin.cpp
mcsadmin.h

BIN
oamapps/mcsadmin/mcsadmin.kdevelop.pcs Normal file
View File

Binary file not shown.

9
utils/loggingcpp/loggingcpp.kdevses → oamapps/mcsadmin/mcsadmin.kdevses
View File

@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="2" >
<Doc0 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/utils/loggingcpp/Calpont.xml" >
<View0 line="0" Type="Source" />
<DocsAndViews NumberOfDocuments="1" >
<Doc0 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oamapps/mcsadmin/mcsadmin.cpp" >
<View0 line="4830" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/etc/Calpont.xml" >
<View0 line="11" Type="Source" />
</Doc1>
</DocsAndViews>
<pluginList>
<kdevdebugger>

275
oamapps/postConfigure/Doxyfile Normal file
View File

@ -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

0
oamapps/postConfigure/amazonInstaller.d.5996 Normal file
View File

0
oamapps/postConfigure/amazonInstaller.d.6154 Normal file
View File

0
oamapps/postConfigure/amazonInstaller.d.6264 Normal file
View File

0
oamapps/postConfigure/amazonInstaller.d.6383 Normal file
View File

0
oamapps/postConfigure/getMySQLpw.d.5982 Normal file
View File

0
oamapps/postConfigure/getMySQLpw.d.6140 Normal file
View File

0
oamapps/postConfigure/getMySQLpw.d.6250 Normal file
View File

0
oamapps/postConfigure/getMySQLpw.d.6369 Normal file
View File

14
oamapps/postConfigure/helpers.cpp
View File

@ -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);
}

0
oamapps/postConfigure/helpers.d.6024 Normal file
View File

0
oamapps/postConfigure/helpers.d.6182 Normal file
View File

0
oamapps/postConfigure/helpers.d.6292 Normal file
View File

0
oamapps/postConfigure/helpers.d.6411 Normal file
View File

0
oamapps/postConfigure/installer.d.6010 Normal file
View File

0
oamapps/postConfigure/installer.d.6168 Normal file
View File

0
oamapps/postConfigure/installer.d.6278 Normal file
View File

0
oamapps/postConfigure/installer.d.6397 Normal file
View File

0
oamapps/postConfigure/mycnfUpgrade.d.5989 Normal file
View File

0
oamapps/postConfigure/mycnfUpgrade.d.6147 Normal file
View File

0
oamapps/postConfigure/mycnfUpgrade.d.6257 Normal file
View File

0
oamapps/postConfigure/mycnfUpgrade.d.6376 Normal file
View File

0
oamapps/postConfigure/patchInstaller.d.6003 Normal file
View File

0
oamapps/postConfigure/patchInstaller.d.6161 Normal file
View File

0
oamapps/postConfigure/patchInstaller.d.6271 Normal file
View File

0
oamapps/postConfigure/patchInstaller.d.6390 Normal file
View File

344
oamapps/postConfigure/postConfigure.cpp
View File

File diff suppressed because it is too large Load Diff

0
oamapps/postConfigure/postConfigure.d.6017 Normal file
View File

0
oamapps/postConfigure/postConfigure.d.6175 Normal file
View File

0
oamapps/postConfigure/postConfigure.d.6285 Normal file
View File

0
oamapps/postConfigure/postConfigure.d.6404 Normal file
View File

76
oamapps/postConfigure/postConfigure.kdevelop Normal file
View File

@ -0,0 +1,76 @@
<?xml version="1.0"?>
<kdevelop>
<general>
<author></author>
<email>dhill@srvhill04.calpont.com</email>
<version>$VERSION$</version>
<projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts>
</ignoreparts>
</general>
<kdevcustomproject>
<run>
<mainprogram>postConfigure</mainprogram>
</run>
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell></dbgshell>
</general>
</kdevdebugger>
<kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
<toc>bash</toc>
<toc>bash_bugs</toc>
<toc>clanlib</toc>
<toc>fortran_bugs_gcc</toc>
<toc>gnome1</toc>
<toc>gnustep</toc>
<toc>gtk</toc>
<toc>gtk_bugs</toc>
<toc>haskell</toc>
<toc>haskell_bugs_ghc</toc>
<toc>java_bugs_gcc</toc>
<toc>java_bugs_sun</toc>
<toc>kde2book</toc>
<toc>opengl</toc>
<toc>pascal_bugs_fp</toc>
<toc>php</toc>
<toc>php_bugs</toc>
<toc>perl</toc>
<toc>perl_bugs</toc>
<toc>python</toc>
<toc>python_bugs</toc>
<toc>qt-kdev3</toc>
<toc>ruby</toc>
<toc>ruby_bugs</toc>
<toc>sdl</toc>
<toc>sw</toc>
<toc>w3c-dom-level2-html</toc>
<toc>w3c-svg</toc>
<toc>w3c-uaag10</toc>
<toc>wxwidgets_bugs</toc>
</ignoretocs>
<ignoreqt_xml>
<toc>Guide to the Qt Translation Tools</toc>
<toc>Qt Assistant Manual</toc>
<toc>Qt Designer Manual</toc>
<toc>Qt Reference Documentation</toc>
<toc>qmake User Guide</toc>
</ignoreqt_xml>
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
</kdevdoctreeview>
<kdevfilecreate>
<filetypes/>
<useglobaltypes>
<type ext="ui" />
<type ext="cpp" />
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
</kdevelop>

BIN
utils/loggingcpp/loggingcpp.kdevelop.pcs
View File

Binary file not shown.