database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-25 15:25:16 -05:00
parent 5b7b3472c3
commit 2c38d5ba4f
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/install_calpont_mysql.sh
View File

@ -26,7 +26,7 @@ done
df=$installdir/mysql/my.cnf df=$installdir/mysql/my.cnf
$installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2> ${tmpdir}mysql_install.log <<EOD $installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
INSTALL PLUGIN columnstore SONAME 'libcalmysql.so'; INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
INSTALL PLUGIN infinidb SONAME 'libcalmysql.so'; INSTALL PLUGIN infinidb SONAME 'libcalmysql.so';
INSTALL PLUGIN columnstore_tables SONAME 'is_columnstore_tables.so'; INSTALL PLUGIN columnstore_tables SONAME 'is_columnstore_tables.so';

4
oam/install_scripts/columnstore
View File

@ -59,7 +59,7 @@ fi
lockdir=`$InstallDir/bin/getConfig Installation LockFileDirectory` lockdir=`$InstallDir/bin/getConfig Installation LockFileDirectory`
#get temp directory #get temp directory
tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir` tmpDir=`$InstallDir/bin/getConfig SystemConfig SystemTempFileDir`
checkInstallSetup() { checkInstallSetup() {
InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag` InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag`
@ -103,7 +103,7 @@ start() {
RETVAL=0 RETVAL=0
echo "Starting MariaDB Columnstore Database Platform" echo "Starting MariaDB Columnstore Database Platform"
rm -f ${tmpDir}/StopColumnstore rm -f ${tmpDir}/StopColumnstore
exec $InstallDir/bin/run.sh $InstallDir/bin/ProcMon > /dev/null 2>&1 & exec $InstallDir/bin/run.sh -l ${tmpDir} $InstallDir/bin/ProcMon > /dev/null 2>&1 &
return $RETVAL return $RETVAL
} }

12
oam/install_scripts/run.sh
View File

@ -3,13 +3,14 @@
# $Id$ # $Id$
# #
usage="usage: run.sh [-vh] [-s sleep] [-t tries] executable" usage="usage: run.sh [-vh] [-s sleep] [-t tries] [-l logDir] executable"
vflg=0 vflg=0
sopt="5" sopt="5"
topt="0" topt="0"
lopt="/tmp/columnstore_tmp_files"
while getopts "vs:t:h" flag; do while getopts "vs:t:h:l" flag; do
case $flag in case $flag in
v) vflg=1 v) vflg=1
;; ;;
@ -17,6 +18,8 @@ while getopts "vs:t:h" flag; do
;; ;;
t) topt=$OPTARG t) topt=$OPTARG
;; ;;
t) lopt=$OPTARG
;;
h) echo $usage h) echo $usage
exit 0 exit 0
;; ;;
@ -45,12 +48,9 @@ if [ $vflg -gt 0 ]; then
echo "starting $exename $args with sleep=$sopt and tries=$topt" echo "starting $exename $args with sleep=$sopt and tries=$topt"
fi fi
#get temp directory
tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir`
while [ $keep_going -ne 0 ]; do while [ $keep_going -ne 0 ]; do
$exename $args $exename $args
if [ -e ${tmpDir}/StopColumnstore ]; then if [ -e ${lopt}/StopColumnstore ]; then
exit 0 exit 0
fi fi
if [ $topt -gt 0 -a $retries -ge $topt ]; then if [ $topt -gt 0 -a $retries -ge $topt ]; then

8
procmon/processmonitor.cpp
View File

@ -2670,16 +2670,16 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
if ( LogFile == "off" ) if ( LogFile == "off" )
{ {
string cmd = "mv " + outFileName + " " + saveoutFileName; string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null";
system(cmd.c_str()); system(cmd.c_str());
cmd = "mv " + errFileName + " " + saveerrFileName; cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null";
system(cmd.c_str()); system(cmd.c_str());
} }
else else
{ {
string cmd = "mv " + outFileName + " " + saveoutFileName; string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null";
system(cmd.c_str()); system(cmd.c_str());
cmd = "mv " + errFileName + " " + saveerrFileName; cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null";
system(cmd.c_str()); system(cmd.c_str());
} }