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
Merge branch 'develop-1.1' into 1.1-merge-up-20180817
This commit is contained in:
Andrew Hutchings
@ -463,7 +463,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
|
||||
int pid = getpid();
|
||||
int tid = gettid();
|
||||
|
||||
// get reporting Pprocess Name
|
||||
// get reporting Process Name
|
||||
string processName;
|
||||
|
||||
if ( repProcessName.empty())
|
||||
@ -514,7 +514,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
|
||||
args.add("sendAlarmReport error:");
|
||||
args.add(e.what());
|
||||
msg.format(args);
|
||||
ml.logErrorMessage(msg);
|
||||
ml.logDebugMessage(msg);
|
||||
}
|
||||
catch (std::exception& e)
|
||||
{
|
||||
@ -525,7 +525,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
|
||||
args.add("sendAlarmReport error:");
|
||||
args.add(e.what());
|
||||
msg.format(args);
|
||||
ml.logErrorMessage(msg);
|
||||
ml.logDebugMessage(msg);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@ -536,7 +536,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
|
||||
args.add("sendAlarmReport error:");
|
||||
args.add("general failure");
|
||||
msg.format(args);
|
||||
ml.logErrorMessage(msg);
|
||||
ml.logDebugMessage(msg);
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
@ -37,13 +37,13 @@ install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(amazonInstaller_SRCS amazonInstaller.cpp helpers.cpp)
|
||||
#set(amazonInstaller_SRCS amazonInstaller.cpp helpers.cpp)
|
||||
|
||||
add_executable(amazonInstaller ${amazonInstaller_SRCS})
|
||||
#add_executable(amazonInstaller ${amazonInstaller_SRCS})
|
||||
|
||||
target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
|
||||
#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
|
||||
|
||||
install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
|
||||
#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
@ -56,3 +56,8 @@ target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_
|
||||
|
||||
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh
|
||||
DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
|
||||
|
||||
@ -170,6 +170,12 @@ int main(int argc, char* argv[])
|
||||
if (p && *p)
|
||||
USER = p;
|
||||
|
||||
// setup to start on reboot, for non-root amazon installs
|
||||
if ( !rootUser )
|
||||
{
|
||||
system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
|
||||
}
|
||||
|
||||
//copy Columnstore.xml.rpmsave if upgrade option is selected
|
||||
if ( installType == "upgrade" )
|
||||
{
|
||||
@ -896,7 +902,10 @@ int main(int argc, char* argv[])
|
||||
|
||||
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
|
||||
|
||||
cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
|
||||
if ( !rootUser )
|
||||
cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
|
||||
|
||||
cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
|
||||
|
||||
cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
|
||||
cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
|
||||
@ -912,7 +921,10 @@ int main(int argc, char* argv[])
|
||||
cout << endl << "ERROR: MariaDB ColumnStore Process failed to start, check log files in /var/log/mariadb/columnstore" << endl;
|
||||
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
|
||||
|
||||
cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
|
||||
if ( !rootUser )
|
||||
cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
|
||||
|
||||
cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
|
||||
|
||||
cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
|
||||
cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
81
oamapps/postConfigure/quick_installer_amazon.sh
Executable file
81
oamapps/postConfigure/quick_installer_amazon.sh
Executable file
@ -0,0 +1,81 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: quick_installer_amazon.sh 3705 2018-07-07 19:47:20Z dhill $
|
||||
#
|
||||
# Poddst- Quick Installer for Amazon MariaDB Columnstore
|
||||
|
||||
pmCount=""
|
||||
umCount=""
|
||||
systemName=""
|
||||
|
||||
for arg in "$@"; do
|
||||
if [ `expr -- "$arg" : '--pm-count='` -eq 11 ]; then
|
||||
pmCount="`echo $arg | awk -F= '{print $2}'`"
|
||||
elif [ `expr -- "$arg" : '--um-count='` -eq 11 ]; then
|
||||
umCount="`echo $arg | awk -F= '{print $2}'`"
|
||||
elif [ `expr -- "$arg" : '--system-name='` -eq 14 ]; then
|
||||
systemName="`echo $arg | awk -F= '{print $2}'`"
|
||||
systemName="-sn "$systemName
|
||||
elif [ `expr -- "$arg" : '--dist-install'` -eq 14 ]; then
|
||||
nonDistrubutedInstall=" "
|
||||
elif [ `expr -- "$arg" : '--help'` -eq 6 ]; then
|
||||
echo "Usage ./quick_installer_amazon.sh [OPTION]"
|
||||
echo ""
|
||||
echo "Quick Installer for an Amazon MariaDB ColumnStore Install"
|
||||
echo "This requires to be run on a MariaDB ColumnStore AMI"
|
||||
echo ""
|
||||
echo "Performace Module (pm) number is required"
|
||||
echo "User Module (um) number is option"
|
||||
echo "When only pm counts provided, system is combined setup"
|
||||
echo "When both pm/um counts provided, system is seperate setup"
|
||||
echo
|
||||
echo "--pm-count=x Number of pm instances to create"
|
||||
echo "--um-count=x Number of um instances to create, optional"
|
||||
echo "--system-name=nnnn System Name, optional"
|
||||
echo ""
|
||||
exit 1
|
||||
else
|
||||
echo "./quick_installer_amazon.sh: unknown argument: $arg, enter --help for help" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ $pmCount = "" ]]; then
|
||||
echo ""
|
||||
echo "Performace Module (pm) count is required, exiting"
|
||||
exit 1
|
||||
else
|
||||
if [[ $umCount = "" ]]; then
|
||||
echo ""
|
||||
echo "NOTE: Performing a Multi-Server Combined install with um/pm running on some server"
|
||||
echo""
|
||||
else
|
||||
echo ""
|
||||
echo "NOTE: Performing a Multi-Server Seperate install with um and pm running on seperate servers"
|
||||
echo""
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $HOME = "/root" ]]; then
|
||||
echo "${bold}Run post-install script${normal}"
|
||||
echo ""
|
||||
/usr/local/mariadb/columnstore/bin/post-install
|
||||
echo "${bold}Run postConfigure script${normal}"
|
||||
echo ""
|
||||
if [[ $umCount = "" ]]; then
|
||||
/usr/local/mariadb/columnstore/bin/postConfigure -qa -pm-count $pmCount $systemName
|
||||
else
|
||||
/usr/local/mariadb/columnstore/bin/postConfigure -qa -pm-count $pmCount -um-count $umCount $systemName
|
||||
fi
|
||||
else
|
||||
echo "${bold}Run post-install script${normal}"
|
||||
echo ""
|
||||
$HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
|
||||
echo "${bold}Run postConfigure script${normal}"
|
||||
echo ""
|
||||
if [[ $umCount = "" ]]; then
|
||||
. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount $systemName
|
||||
else
|
||||
. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount -um-count $umCount $systemName
|
||||
fi
|
||||
fi
|
||||
85
oamapps/postConfigure/quick_installer_multi_server.sh
Executable file
85
oamapps/postConfigure/quick_installer_multi_server.sh
Executable file
@ -0,0 +1,85 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: quick_installer_multi_server.sh 3705 2018-07-07 19:47:20Z dhill $
|
||||
#
|
||||
# Poddst- Quick Installer for Multi Server MariaDB Columnstore
|
||||
|
||||
pmIpAddrs=""
|
||||
umIpAddrs=""
|
||||
nonDistrubutedInstall="-n"
|
||||
systemName=""
|
||||
|
||||
for arg in "$@"; do
|
||||
if [ `expr -- "$arg" : '--pm-ip-addresses='` -eq 18 ]; then
|
||||
pmIpAddrs="`echo $arg | awk -F= '{print $2}'`"
|
||||
elif [ `expr -- "$arg" : '--um-ip-addresses='` -eq 18 ]; then
|
||||
umIpAddrs="`echo $arg | awk -F= '{print $2}'`"
|
||||
elif [ `expr -- "$arg" : '--system-name='` -eq 14 ]; then
|
||||
systemName="`echo $arg | awk -F= '{print $2}'`"
|
||||
systemName="-sn "$systemName
|
||||
elif [ `expr -- "$arg" : '--dist-install'` -eq 14 ]; then
|
||||
nonDistrubutedInstall=" "
|
||||
elif [ `expr -- "$arg" : '--help'` -eq 6 ]; then
|
||||
echo "Usage ./quick_installer_multi_server.sh [OPTION]"
|
||||
echo ""
|
||||
echo "Quick Installer for a Multi Server MariaDB ColumnStore Install"
|
||||
echo ""
|
||||
echo "Defaults to non-distrubuted install, meaning MariaDB Columnstore"
|
||||
echo "needs to be preinstalled on all nodes in the system"
|
||||
echo ""
|
||||
echo "Performace Module (pm) IP addresses are required"
|
||||
echo "User Module (um) IP addresses are option"
|
||||
echo "When only pm IP addresses provided, system is combined setup"
|
||||
echo "When both pm/um IP addresses provided, system is seperate setup"
|
||||
echo
|
||||
echo "--pm-ip-addresses=xxx.xxx.xxx.xxx,xxx.xxx.xxx.xxx"
|
||||
echo "--um-ip-addresses=xxx.xxx.xxx.xxx,xxx.xxx.xxx.xxx, optional"
|
||||
echo "--dist-install Use Distributed Install, optional"
|
||||
echo "--system-name=nnnn System Name, optional"
|
||||
echo ""
|
||||
exit 1
|
||||
else
|
||||
echo "quick_installer_multi_server.sh: unknown argument: $arg, enter --help for help" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ $pmIpAddrs = "" ]]; then
|
||||
echo ""
|
||||
echo "Performace Module (pm) IP addresses required, exiting"
|
||||
exit 1
|
||||
else
|
||||
if [[ $umIpAddrs = "" ]]; then
|
||||
echo ""
|
||||
echo "NOTE: Performing a Multi-Server Combined install with um/pm running on some server"
|
||||
echo""
|
||||
else
|
||||
echo ""
|
||||
echo "NOTE: Performing a Multi-Server Seperate install with um and pm running on seperate servers"
|
||||
echo""
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $HOME = "/root" ]]; then
|
||||
echo "${bold}Run post-install script${normal}"
|
||||
echo ""
|
||||
/usr/local/mariadb/columnstore/bin/post-install
|
||||
echo "${bold}Run postConfigure script${normal}"
|
||||
echo ""
|
||||
if [[ $umIpAddrs = "" ]]; then
|
||||
/usr/local/mariadb/columnstore/bin/postConfigure -qm -pm-ip-addrs $pmIpAddrs $nonDistrubutedInstall $systemName
|
||||
else
|
||||
/usr/local/mariadb/columnstore/bin/postConfigure -qm -pm-ip-addrs $pmIpAddrs -um-ip-addrs $umIpAddrs $nonDistrubutedInstall $systemName
|
||||
fi
|
||||
else
|
||||
echo "${bold}Run post-install script${normal}"
|
||||
echo ""
|
||||
$HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
|
||||
echo "${bold}Run postConfigure script${normal}"
|
||||
echo ""
|
||||
if [[ $umIpAddrs = "" ]]; then
|
||||
. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs $nonDistrubutedInstall $systemName
|
||||
else
|
||||
. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs -um-ip-addrs $umIpAddrs $nonDistrubutedInstall $systemName
|
||||
fi
|
||||
fi
|
||||
34
oamapps/postConfigure/quick_installer_single_server.sh
Executable file
34
oamapps/postConfigure/quick_installer_single_server.sh
Executable file
@ -0,0 +1,34 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: quick_installer_single_server.sh 3705 2018-07-07 19:47:20Z dhill $
|
||||
#
|
||||
# Poddst- Quick Installer for Single Server MariaDB Columnstore
|
||||
|
||||
for arg in "$@"; do
|
||||
if [ `expr -- "$arg" : '--help'` -eq 6 ]; then
|
||||
echo "Usage ./quick_installer_multi_server.sh"
|
||||
echo ""
|
||||
echo "Quick Installer for a Single Server MariaDB ColumnStore Install"
|
||||
echo ""
|
||||
exit 1
|
||||
else
|
||||
echo "quick_installer_multi_server.sh: ignoring unknown argument: $arg" 1>&2
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
if [ $HOME == "/root" ]; then
|
||||
echo "Run post-install script"
|
||||
echo ""
|
||||
/usr/local/mariadb/columnstore/bin/post-install
|
||||
echo "Run postConfigure script"
|
||||
echo ""
|
||||
/usr/local/mariadb/columnstore/bin/postConfigure -qs
|
||||
else
|
||||
echo "Run post-install script"
|
||||
echo ""
|
||||
$HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
|
||||
echo "Run postConfigure script"
|
||||
echo ""
|
||||
. /etc/profile.d/columnstoreEnv.sh; $HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qs
|
||||
fi
|
||||
Reference in New Issue
Block a user