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

MCOL-5001 This patch removes ExeMgr traces

Browse Source
This commit is contained in:
Roman Nozdrin
2022-04-04 12:50:42 +00:00
parent e174696351
commit 7453db6b02
21 changed files with 30 additions and 2531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oam/install_scripts/CMakeLists.txt
View File

@ -10,7 +10,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore-start.sh.in" "${
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-workernode.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-workernode.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-controllernode.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-controllernode.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-primproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-primproc.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-exemgr.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-exemgr.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service" @ONLY)
@ -21,12 +20,12 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py.in" "${CMAKE_CURRENT_
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-savebrm.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-savebrm.py" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstoreSyslog.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstoreSyslog" @ONLY)
install(PROGRAMS columnstore-post-install
columnstore-pre-uninstall
columnstore_run.sh
post-mysql-install
post-mysqld-install
columnstoreSyslogSetup.sh
install(PROGRAMS columnstore-post-install
columnstore-pre-uninstall
columnstore_run.sh
post-mysql-install
post-mysqld-install
columnstoreSyslogSetup.sh
mcs-stop-controllernode.sh
mcs-loadbrm.py
mcs-savebrm.py
@ -45,7 +44,6 @@ install(FILES mariadb-columnstore.service
mcs-workernode.service
mcs-controllernode.service
mcs-primproc.service
mcs-exemgr.service
mcs-writeengineserver.service
mcs-dmlproc.service
mcs-ddlproc.service

26
oam/install_scripts/columnstore-post-install.in
View File

@ -70,7 +70,7 @@ quiet=0
stop_mysqld=0
if [ -z "$(pgrep -x mariadbd)" ];then
# Startup mysqld
# Startup mysqld
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl start mariadb.service
@ -165,8 +165,6 @@ if [ $user = "root" ]; then
cp @ENGINE_SUPPORTDIR@/mcs-ddlproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-dmlproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-dmlproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-exemgr.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-exemgr.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-primproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-primproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-workernode.service /usr/lib/systemd/system/mcs-workernode@.service >/dev/null 2>&1
@ -203,7 +201,7 @@ if [ $user = "root" ]; then
update-rc.d columnstore defaults 99 > /dev/null 2>&1
else
echo ""
echo "Package 'systemctl', 'chkconfig' or 'update-rc.d' not installed, contact your sysadmin if you want to setup to autostart for columnstore"
echo "Package 'systemctl', 'chkconfig' or 'update-rc.d' not installed, contact your sysadmin if you want to setup to autostart for columnstore"
fi
fi
fi
@ -225,7 +223,7 @@ if [ $user = "root" ]; then
fi
else
chown $user:$user @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml
cat <<EOD
NOTE: For non-root install, you will need to run the following commands as root user to
@ -261,13 +259,13 @@ else
sleep 1
done
/usr/bin/mysqld_safe &
sleep 2
sleep 2
fi
checkForError
if [ $? -ne 0 ]; then
echo "There was an error installing MariaDB ColumnStore engine plugin. \
Continue to install the engine though. \
Continue to install the engine though. \
Please resolve the issues and run necessary scripts manually."
fi
@ -290,18 +288,18 @@ fi
if [ ! -z "$MCS_USE_S3_STORAGE" ] && [ $MCS_USE_S3_STORAGE -eq 1 ]; then
if [ -z "$MCS_S3_BUCKET" ]; then
echo "Environment variable \$MCS_USE_S3_STORAGE is set but there is no \$MCS_S3_BUCKET."
fi
fi
if [ -z "$MCS_S3_ACCESS_KEY_ID" ] && [ -z "$MCS_S3_ROLE_NAME" ]; then
echo "Environment variable \$MCS_USE_S3_STORAGE is set but there is no \$MCS_S3_ACCESS_KEY_ID."
fi
fi
if [ -z "$MCS_S3_SECRET_ACCESS_KEY" ] && [ -z "$MCS_S3_ROLE_NAME" ]; then
echo "Environment variable \$MCS_USE_S3_STORAGE is set but there is no \$MCS_S3_SECRET_ACCESS_KEY."
fi
if [ -z "$MCS_S3_BUCKET" ] || [[ -z "$MCS_S3_ACCESS_KEY_ID" && -z "$MCS_S3_ROLE_NAME" ]] || [[ -z "$MCS_S3_SECRET_ACCESS_KEY" && -z "$MCS_S3_ROLE_NAME" ]]; then
fi
if [ -z "$MCS_S3_BUCKET" ] || [[ -z "$MCS_S3_ACCESS_KEY_ID" && -z "$MCS_S3_ROLE_NAME" ]] || [[ -z "$MCS_S3_SECRET_ACCESS_KEY" && -z "$MCS_S3_ROLE_NAME" ]]; then
echo "Using local storage."
else
@ENGINE_BINDIR@/mcsSetConfig -d Installation DBRootStorageType "storagemanager"
@ENGINE_BINDIR@/mcsSetConfig -d StorageManager Enabled "Y"
@ENGINE_BINDIR@/mcsSetConfig -d StorageManager Enabled "Y"
@ENGINE_BINDIR@/mcsSetConfig -d SystemConfig DataFilePlugin "libcloudio.so"
sed -i "s|^service =.*|service = S3|" /etc/columnstore/storagemanager.cnf
if [ ! -z "$MCS_S3_REGION" ]; then
@ -342,7 +340,7 @@ if [ ! -z "$MCS_USE_S3_STORAGE" ] && [ $MCS_USE_S3_STORAGE -eq 1 ]; then
echo "After environment variables are fixed, run command: columnstore-post-install"
exit 1
fi
fi
fi
fi
#change ownership/permissions to be able to run columnstore as non-root
@ -377,7 +375,7 @@ if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
flock -u "$fd_lock"
fi
if [ $stop_mysqld -eq 1 ];then
# Make sure we stop mariadb since it wasn't running prior to columnstore installation
systemctl cat mariadb.service > /dev/null 2>&1

14
oam/install_scripts/columnstore-pre-uninstall.in
View File

@ -35,7 +35,7 @@ systemctl cat mariadb-columnstore.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb-columnstore >/dev/null 2>&1
else
PROGS='PrimProc ExeMgr DMLProc DDLProc WriteEngineServer StorageManager controllernode workernode'
PROGS='PrimProc ExeMgr DMLProc DDLProc WriteEngineServer StorageManager controllernode workernode'
kill $(pidof $PROGS) > /dev/null
sleep 3
kill -9 $(pidof $PROGS) > /dev/null
@ -43,7 +43,7 @@ else
fi
if [ -n "$(pgrep -x ProcMon)" ] || [ -n "$(pgrep -x ProcMgr)" ];then
# Old system must be running, kill ProcMon/ProcMgr
# Old system must be running, kill ProcMon/ProcMgr
pkill ProcMon
pkill ProcMgr
fi
@ -94,8 +94,12 @@ if [ -n "$systemctl" ] && [ $(running_systemd) -eq 0 ]; then
rm -f /lib/systemd/system/mcs-ddlproc.service
rm -f /usr/lib/systemd/system/mcs-dmlproc.service
rm -f /lib/systemd/system/mcs-dmlproc.service
rm -f /usr/lib/systemd/system/mcs-exemgr.service
rm -f /lib/systemd/system/mcs-exemgr.service
if [[ -f /usr/lib/systemd/system/mcs-exemgr.service ]]
rm -f /usr/lib/systemd/system/mcs-exemgr.service
fi
if [[ -f /lib/systemd/system/mcs-exemgr.service ]]
rm -f /lib/systemd/system/mcs-exemgr.service
fi
rm -f /usr/lib/systemd/system/mcs-primproc.service
rm -f /lib/systemd/system/mcs-primproc.service
rm -f /usr/lib/systemd/system/mcs-workernode@.service
@ -123,7 +127,7 @@ else
updaterc=`which update-rc.d 2>/dev/null`
if [ -n "$updaterc" ]; then
update-rc.d -f columnstore remove > /dev/null 2>&1
rm -f /etc/init.d/columnstore > /dev/null 2>&1
rm -f /etc/init.d/columnstore > /dev/null 2>&1
fi
fi
fi

1
oam/install_scripts/mariadb-columnstore-start.sh.in
View File

@ -12,7 +12,6 @@ flock -n "$fd_lock" || exit 0
/bin/systemctl start mcs-controllernode
/bin/systemctl start mcs-primproc
/bin/systemctl start mcs-writeengineserver
/bin/systemctl start mcs-exemgr
/bin/systemctl start mcs-dmlproc
/bin/systemctl start mcs-ddlproc
su -s /bin/sh -c '@ENGINE_BINDIR@/dbbuilder 7' @DEFAULT_USER@ 1> @ENGINE_LOGDIR@/install/dbbuilder.log

1
oam/install_scripts/mariadb-columnstore-stop.sh
View File

@ -4,7 +4,6 @@
/bin/systemctl stop mcs-dmlproc
/bin/systemctl stop mcs-ddlproc
/bin/systemctl stop mcs-exemgr
/bin/systemctl stop mcs-writeengineserver
/bin/systemctl stop mcs-primproc
/bin/systemctl stop mcs-controllernode

23
oam/install_scripts/mcs-exemgr.service.in
View File

@ -1,23 +0,0 @@
[Unit]
Description=mcs-exemgr
# restart/start mcs-exemgr on restart/start of mcs-primproc
PartOf=mcs-primproc.service
After=network.target mcs-primproc.service
[Service]
Type=oneshot
User=@DEFAULT_USER@
Group=@DEFAULT_GROUP@
LimitNOFILE=65536
LimitNPROC=65536
#ExecStartPre=/usr/bin/env bash -c "ldconfig -p | grep -m1 libjemalloc > /dev/null || echo 'Please install jemalloc to avoid ColumnStore performance degradation and unexpected service interruptions.'"
#ExecStart=/usr/bin/env bash -c "LD_PRELOAD=$(ldconfig -p | grep -m1 libjemalloc | awk '{print $1}') exec @ENGINE_BINDIR@/ExeMgr"
ExecStart=/bin/echo 'EM dummy start'
RemainAfterExit=yes
Restart=on-failure
TimeoutStopSec=2

6
oam/install_scripts/mcs-writeengineserver.service.in
View File

@ -1,9 +1,9 @@
[Unit]
Description=WriteEngineServer
# restart/stop mcs-writeengineserver on restart/stop of mcs-exemgr
PartOf=mcs-exemgr.service
After=network.target mcs-exemgr.service
# restart/stop mcs-writeengineserver on restart/stop of mcs-primproc
PartOf=mcs-primproc.service
After=network.target mcs-primproc.service
[Service]
Type=forking