You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
fix the sudo calls by root user
This commit is contained in:
David Hill
@ -57,10 +57,10 @@ if [ "x$has_um" = x ]; then
|
||||
fi
|
||||
|
||||
user=$USER
|
||||
sudo=sudo
|
||||
SUDO=sudo
|
||||
if [ -z "$user" ]; then
|
||||
user=root
|
||||
sudo=" "
|
||||
SUDO=" "
|
||||
fi
|
||||
|
||||
checkInstallSetup() {
|
||||
@ -68,7 +68,7 @@ checkInstallSetup() {
|
||||
if [ $InitialInstallFlag != "y" ]; then
|
||||
echo "Please run the postConfigure install script, check the Installation Guide"
|
||||
echo "for additional details"
|
||||
sudo rm -f /var/lock/subsys/columnstore
|
||||
$SUDO rm -f /var/lock/subsys/columnstore
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -81,13 +81,13 @@ start() {
|
||||
exit 0
|
||||
fi
|
||||
|
||||
(sudo mkdir -p /var/lock/subsys && sudo chmod 777 /var/lock/subsys && sudo touch /var/lock/subsys/columnstore) >/dev/null 2>&1
|
||||
($SUDO mkdir -p /var/lock/subsys && $SUDO chmod 777 /var/lock/subsys && $SUDO touch /var/lock/subsys/columnstore) >/dev/null 2>&1
|
||||
|
||||
if [ -x $InstallDir/bin/columnstore.pre-start ]; then
|
||||
$InstallDir/bin/columnstore.pre-start
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error running MariaDB Columnstore pre-start script, not starting MariaDB Columnstore"
|
||||
sudo rm -f /var/lock/subsys/columnstore
|
||||
$SUDO rm -f /var/lock/subsys/columnstore
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@ -97,7 +97,7 @@ start() {
|
||||
if [ $CoreFileFlag = "y" ]; then
|
||||
SUDO=
|
||||
if [ "$user" != "root" ]; then
|
||||
SUDO="sudo"
|
||||
SUDO="$SUDO"
|
||||
fi
|
||||
|
||||
#columnstore core files
|
||||
@ -108,21 +108,21 @@ start() {
|
||||
|
||||
RETVAL=0
|
||||
echo "Starting MariaDB Columnstore Database Platform"
|
||||
sudo rm -f /tmp/StopColumnstore
|
||||
$SUDO 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"
|
||||
sudo touch /tmp/StopColumnstore
|
||||
sudo pkill ProcMon
|
||||
sudo pkill ProcMgr
|
||||
$SUDO touch /tmp/StopColumnstore
|
||||
$SUDO pkill ProcMon
|
||||
$SUDO pkill ProcMgr
|
||||
sleep 1
|
||||
$InstallDir/bin/clearShm
|
||||
RETVAL=$?
|
||||
sudo rm -f /var/lock/subsys/columnstore
|
||||
sudo fuser -k 8604/tcp > /dev/null 2>&1
|
||||
$SUDO rm -f /var/lock/subsys/columnstore
|
||||
$SUDO fuser -k 8604/tcp > /dev/null 2>&1
|
||||
test -f $InstallDir/mysql/mysql-Columnstore || return $RETVAL
|
||||
$InstallDir/mysql/mysql-Columnstore stop > /dev/null 2>&1
|
||||
if [ -x $InstallDir/bin/columnstore.post-stop ]; then
|
||||
|
||||
@ -8,10 +8,10 @@ prefix=/usr/local
|
||||
installdir=$prefix/mariadb/columnstore
|
||||
rpmmode=install
|
||||
user=root
|
||||
sudo=" "
|
||||
SUDO=" "
|
||||
if [ $USER != "root" ]; then
|
||||
user=$USER
|
||||
sudo="sudo "
|
||||
SUDO="sudo "
|
||||
fi
|
||||
|
||||
quiet=0
|
||||
@ -82,7 +82,7 @@ if [ -f libstdc++.so.6.0.14 ]; then
|
||||
fi
|
||||
|
||||
# softlink for libperl.sp, used by cplogger
|
||||
sudo ln -s /usr/lib64/perl5/CORE/libperl.so /usr/lib64/libperl.so >/dev/null 2>&1
|
||||
$SUDO ln -s /usr/lib64/perl5/CORE/libperl.so /usr/lib64/libperl.so >/dev/null 2>&1
|
||||
|
||||
#setup .bashrc
|
||||
if [ $user = "root" ]; then
|
||||
@ -121,9 +121,9 @@ fi
|
||||
|
||||
cd /
|
||||
|
||||
test -d /var/log/mariadb || sudo mkdir /var/log/mariadb >/dev/null 2>&1
|
||||
test -d /var/log/mariadb/columnstore || sudo mkdir /var/log/mariadb/columnstore >/dev/null 2>&1
|
||||
sudo chmod -R 777 /var/log/mariadb
|
||||
test -d /var/log/mariadb || $SUDO mkdir /var/log/mariadb >/dev/null 2>&1
|
||||
test -d /var/log/mariadb/columnstore || $SUDO mkdir /var/log/mariadb/columnstore >/dev/null 2>&1
|
||||
$SUDO chmod -R 777 /var/log/mariadb
|
||||
|
||||
test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1
|
||||
test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
|
||||
@ -161,8 +161,8 @@ mkdir /mnt/tmp > /dev/null 2>&1
|
||||
mkdir /var/log/mariadb/columnstore/data/archive > /dev/null 2>&1
|
||||
|
||||
# install Columnstore Log Rotate File
|
||||
sudo cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1
|
||||
sudo chmod 644 /etc/logrotate.d/columnstore
|
||||
$SUDO cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1
|
||||
$SUDO chmod 644 /etc/logrotate.d/columnstore
|
||||
|
||||
# remove mysql archive log
|
||||
test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
|
||||
@ -209,17 +209,17 @@ if [ $user = "root" ]; then
|
||||
chmod 777 -R /dev/shm
|
||||
rm -f /etc/default/columnstore
|
||||
else
|
||||
sudo chmod 777 /tmp
|
||||
sudo rm -fr /tmp/* > /dev/null 2>&1
|
||||
sudo $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1
|
||||
sudo chown $user:$user $installdir/etc/Columnstore.xml
|
||||
sudo chmod -R 777 /dev/shm
|
||||
sudo chmod 777 /var/lock/subsys
|
||||
sudo rm -f /var/lock/subsys/mysql-Columnstore
|
||||
sudo chmod 777 /etc/fstab
|
||||
$SUDO chmod 777 /tmp
|
||||
$SUDO rm -fr /tmp/* > /dev/null 2>&1
|
||||
$SUDO $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1
|
||||
$SUDO chown $user:$user $installdir/etc/Columnstore.xml
|
||||
$SUDO chmod -R 777 /dev/shm
|
||||
$SUDO chmod 777 /var/lock/subsys
|
||||
$SUDO rm -f /var/lock/subsys/mysql-Columnstore
|
||||
$SUDO chmod 777 /etc/fstab
|
||||
|
||||
sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def
|
||||
sudo cp $installdir/bin/columnstore.def /etc/default/columnstore
|
||||
$SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore
|
||||
|
||||
sed -i -e s@prefix=/usr/local@prefix=$HOME@g $installdir/bin/*
|
||||
|
||||
|
||||
@ -78,12 +78,12 @@ for arg in "$@"; do
|
||||
fi
|
||||
done
|
||||
|
||||
#run to make sure library paths are setup
|
||||
sudo ldconfig
|
||||
|
||||
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
|
||||
sudo ldconfig
|
||||
export COLUMNSTORE_INSTALL_DIR=$installdir
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
|
||||
else
|
||||
ldconfig
|
||||
fi
|
||||
|
||||
if [ -f $installdir/lib/libcalmysql.so.1.0.0 ]; then
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
prefix=/usr/local
|
||||
installdir=$prefix/mariadb/columnstore
|
||||
rpmmode=install
|
||||
sudo=" "
|
||||
SUDO=" "
|
||||
if [ $USER != "root" ]; then
|
||||
user=$USER
|
||||
sudo="sudo "
|
||||
SUDO="sudo "
|
||||
fi
|
||||
|
||||
quiet=0
|
||||
@ -45,17 +45,17 @@ $installdir/myql/columnstore-Mysql stop > /dev/null 2>&1
|
||||
|
||||
# uninstall OS scripts updated by postConfigure
|
||||
if test -f /etc/exports.columnstoreSave ; then
|
||||
$sudo mv -f /etc/exports.columnstoreSave /etc/exports > /dev/null 2>&1
|
||||
$SUDO mv -f /etc/exports.columnstoreSave /etc/exports > /dev/null 2>&1
|
||||
else
|
||||
$sudo rm -f /etc/exports > /dev/null 2>&1
|
||||
$SUDO rm -f /etc/exports > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if test -f /etc/rc.d/rc.local.columnstoreSave ; then
|
||||
$sudo mv -f /etc/rc.d/rc.local.columnstoreSave /etc/rc.d/rc.local > /dev/null 2>&1
|
||||
$SUDO mv -f /etc/rc.d/rc.local.columnstoreSave /etc/rc.d/rc.local > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if test -f /etc/rc.local.columnstoreSave ; then
|
||||
$sudo mv -f /etc/rc.local.columnstoreSave /etc/rc.local > /dev/null 2>&1
|
||||
$SUDO mv -f /etc/rc.local.columnstoreSave /etc/rc.local > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
export COLUMNSTORE_INSTALL_DIR=$installdir
|
||||
@ -63,30 +63,30 @@ export COLUMNSTORE_INSTALL_DIR=$installdir
|
||||
cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
|
||||
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
|
||||
if test -f /etc/fstab ; then
|
||||
$sudo sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1
|
||||
$SUDO sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
#remove log file directories
|
||||
#rm -rf /var/log/mariadb/columnstore > /dev/null 2>&1
|
||||
#rm -f $installdir/mysql/db/*.err > /dev/null 2>&1
|
||||
sudo rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
|
||||
sudo rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
|
||||
$SUDO rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
|
||||
$SUDO rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
|
||||
rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
|
||||
sudo rm -f /etc/default/columnstore
|
||||
$SUDO rm -f /etc/default/columnstore
|
||||
|
||||
# remove Mariab Columnstore Log Rotate File abd Transaction Log File
|
||||
sudo rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1
|
||||
sudo rm -f /etc/cron.d/transactionLog > /dev/null 2>&1
|
||||
$SUDO rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1
|
||||
$SUDO rm -f /etc/cron.d/transactionLog > /dev/null 2>&1
|
||||
|
||||
# delete Mariab Columnstore shared memory segments
|
||||
$installdir/bin/clearShm > /dev/null 2>&1
|
||||
|
||||
# delete prat files
|
||||
sudo rm -f /etc/cron.d/ps > /dev/null 2>&1
|
||||
sudo rm -f /etc/pscollect > /dev/null 2>&1
|
||||
sudo /etc/init.d/crond reload > /dev/null 2>&1
|
||||
sudo sudo systemctl reload crond.service > /dev/null 2>&1
|
||||
$SUDO rm -f /etc/cron.d/ps > /dev/null 2>&1
|
||||
$SUDO rm -f /etc/pscollect > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/crond reload > /dev/null 2>&1
|
||||
$SUDO $SUDO systemctl reload crond.service > /dev/null 2>&1
|
||||
|
||||
# delete tmp files
|
||||
rm -f $installdir/local/*.columnstore
|
||||
@ -95,7 +95,7 @@ rm -rf /tmp/bucketreuse
|
||||
rm -f /tmp/columnstore.txt
|
||||
rm -f /tmp/dbbuilder.*
|
||||
rm -f /tmp/dbrmfiles
|
||||
sudo rm -f /var/lock/subsys/columnstore
|
||||
$SUDO rm -f /var/lock/subsys/columnstore
|
||||
rm -f /tmp/pkgcheck
|
||||
rm -f /tmp/upgrade-status.log.*
|
||||
rm -f /tmp/mount.log
|
||||
@ -118,7 +118,7 @@ if [ -x $installdir/bin/syslogSetup.sh ]; then
|
||||
if [ $user = "root" ]; then
|
||||
$installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
|
||||
else
|
||||
sudo $installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
|
||||
$SUDO $installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -158,14 +158,14 @@ fi
|
||||
if [ $user = "root" ]; then
|
||||
rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
|
||||
else
|
||||
sudo rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
|
||||
$SUDO rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
#remove library paths
|
||||
if [ $installdir == "/usr/local/mariadb/columnstore" ]; then
|
||||
# remove library config file
|
||||
sudo rm -f /etc/ld.so.conf.d/columnstore.conf
|
||||
sudo ldconfig
|
||||
$SUDO rm -f /etc/ld.so.conf.d/columnstore.conf
|
||||
$SUDO ldconfig
|
||||
fi
|
||||
|
||||
#cleanup .bashrc
|
||||
|
||||
@ -13,10 +13,10 @@ syslog_conf=nofile
|
||||
rsyslog7=0
|
||||
|
||||
user=$USER
|
||||
sudo=sudo
|
||||
SUDO=sudo
|
||||
if [ -z "$user" ]; then
|
||||
user=root
|
||||
sudo=" "
|
||||
SUDO=" "
|
||||
fi
|
||||
|
||||
|
||||
@ -70,13 +70,13 @@ if [ "$daemon" = "nodaemon" ]; then
|
||||
|
||||
if [ -f /etc/syslog.conf ]; then
|
||||
daemon="syslog"
|
||||
sudo /etc/init.d/syslog start > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog start > /dev/null 2>&1
|
||||
elif [ -f /etc/rsyslog.conf ]; then
|
||||
daemon="rsyslog"
|
||||
sudo /etc/init.d/rsyslog start > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/rsyslog start > /dev/null 2>&1
|
||||
elif [ -f /etc/init.d/syslog-ng ]; then
|
||||
daemon="syslog-ng"
|
||||
sudo /etc/init.d/syslog-ng start > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog-ng start > /dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -100,7 +100,7 @@ if [ "$daemon" = "syslog-ng" ]; then
|
||||
fi
|
||||
elif [ "$daemon" = "rsyslog" ]; then
|
||||
#check if rsyslog version 7 or greater
|
||||
sudo rsyslogd -v > /tmp/rsyslog.ver
|
||||
$SUDO rsyslogd -v > /tmp/rsyslog.ver
|
||||
cnt=`grep "rsyslogd 7" /tmp/rsyslog.ver | wc -l`
|
||||
if [ $cnt -gt 0 ]; then
|
||||
rsyslog7=1
|
||||
@ -157,28 +157,28 @@ checkSyslog
|
||||
if [ ! -z "$syslog_conf" ] ; then
|
||||
$installdir/bin/setConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1
|
||||
if [ "$syslog_conf" != /etc/rsyslog.d/columnstore.conf ]; then
|
||||
sudo rm -f ${syslog_conf}.columnstoreSave
|
||||
sudo cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1
|
||||
sudo sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1
|
||||
$SUDO rm -f ${syslog_conf}.columnstoreSave
|
||||
$SUDO cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1
|
||||
$SUDO sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf}
|
||||
if [ $? -ne 0 ]; then
|
||||
#set the syslog for ColumnStore logging
|
||||
# remove older version incase it was installed by previous build
|
||||
sudo rm -rf /etc/rsyslog.d/columnstore.conf
|
||||
$SUDO rm -rf /etc/rsyslog.d/columnstore.conf
|
||||
if [ $rsyslog7 == 1 ]; then
|
||||
sudo rm -f /etc/rsyslog.d/49-columnstore.conf
|
||||
sudo cp ${columnstoreSyslogFile7} ${syslog_conf}
|
||||
sudo chown syslog:adm /var/log/mariadb/columnstore >/dev/null 2>&1
|
||||
$SUDO rm -f /etc/rsyslog.d/49-columnstore.conf
|
||||
$SUDO cp ${columnstoreSyslogFile7} ${syslog_conf}
|
||||
$SUDO chown syslog:adm /var/log/mariadb/columnstore >/dev/null 2>&1
|
||||
else
|
||||
sudo cp ${columnstoreSyslogFile} ${syslog_conf}
|
||||
$SUDO cp ${columnstoreSyslogFile} ${syslog_conf}
|
||||
fi
|
||||
fi
|
||||
|
||||
sudo etc/init.d/rsyslog restart > /dev/null 2>&1
|
||||
sudo /etc/init.d/syslog restart > /dev/null 2>&1
|
||||
sudo /etc/init.d/syslog-ng restart > /dev/null 2>&1
|
||||
$SUDO etc/init.d/rsyslog restart > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog restart > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog-ng restart > /dev/null 2>&1
|
||||
|
||||
systemctl restart rsyslog.service > /dev/null 2>&1
|
||||
systemctl restart syslog.service > /dev/null 2>&1
|
||||
@ -197,24 +197,24 @@ if [ ! -z "$syslog_conf" ] ; then
|
||||
if [ $? -eq 0 ]; then
|
||||
if [ -f ${syslog_conf}.columnstoreSave ] ; then
|
||||
#uninstall the syslog for ColumnStore logging
|
||||
sudo v -f ${syslog_conf} ${syslog_conf}.ColumnStoreBackup
|
||||
sudo mv -f ${syslog_conf}.columnstoreSave ${syslog_conf} >/dev/null 2>&1
|
||||
$SUDO v -f ${syslog_conf} ${syslog_conf}.ColumnStoreBackup
|
||||
$SUDO mv -f ${syslog_conf}.columnstoreSave ${syslog_conf} >/dev/null 2>&1
|
||||
if [ ! -f ${syslog_conf} ] ; then
|
||||
sudo cp ${syslog_conf}.ColumnStoreBackup ${syslog_conf}
|
||||
$SUDO cp ${syslog_conf}.ColumnStoreBackup ${syslog_conf}
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
sudo sed -i '/# MariaDB/,$d' ${syslog_conf} > /dev/null 2>&1
|
||||
$SUDO sed -i '/# MariaDB/,$d' ${syslog_conf} > /dev/null 2>&1
|
||||
else
|
||||
sudo rm -f "$syslog_conf"
|
||||
$SUDO rm -f "$syslog_conf"
|
||||
fi
|
||||
else
|
||||
sudo rm -f "$syslog_conf"
|
||||
$SUDO rm -f "$syslog_conf"
|
||||
fi
|
||||
|
||||
sudo etc/init.d/rsyslog restart > /dev/null 2>&1
|
||||
sudo /etc/init.d/syslog restart > /dev/null 2>&1
|
||||
sudo /etc/init.d/syslog-ng restart > /dev/null 2>&1
|
||||
$SUDO etc/init.d/rsyslog restart > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog restart > /dev/null 2>&1
|
||||
$SUDO /etc/init.d/syslog-ng restart > /dev/null 2>&1
|
||||
|
||||
systemctl restart rsyslog.service > /dev/null 2>&1
|
||||
systemctl restart syslog.service > /dev/null 2>&1
|
||||
|
||||
Reference in New Issue
Block a user