database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

fixed module _installer code issue

Browse Source
This commit is contained in:
david hill
2017-09-12 09:08:55 -05:00
parent 5df01f749b
commit e4aa86e528
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oam/install_scripts/module_installer.sh
View File

@@ -58,11 +58,7 @@ ServerTypeInstall=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation ServerTyp
cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud` cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
cp $COLUMNSTORE_INSTALL_DIR/local/etc/credentials $HOME/.aws/. > /dev/null 2>&1 cp $COLUMNSTORE_INSTALL_DIR/local/etc/credentials $HOME/.aws/. > /dev/null 2>&1
if [ $user = "root" ]; then sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local
sed -i -e s/#runuser/runuser/g /etc/rc.local
else
sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.local
fi
if [ $module = "pm" ]; then if [ $module = "pm" ]; then
if test -f $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab ; then if test -f $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab ; then

2
oamapps/postConfigure/postConfigure.cpp
View File

@@ -1071,7 +1071,7 @@ int main(int argc, char *argv[])
} }
// setup to start on reboot // setup to start on reboot
system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.local >/dev/null 2>&1"); system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
} }
if ( pmwithum ) if ( pmwithum )

2
procmgr/main.cpp
View File

@@ -170,6 +170,8 @@ int main(int argc, char **argv)
if ( DBRootStorageType == "hdfs" ) if ( DBRootStorageType == "hdfs" )
HDFS = true; HDFS = true;
log.writeLog(__LINE__, "DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
//PMwithUM config //PMwithUM config
try { try {
oam.getSystemConfig( "PMwithUM", PMwithUM); oam.getSystemConfig( "PMwithUM", PMwithUM);