You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-12-04 20:22:42 +03:00
Merge pull request #1053 from LinuxJedi/mariadb-systemctl
MCOL-3793 Fix UM ACTIVE / DEGRADED flip-flop
This commit is contained in:
committed by
Patrick LeBlanc
parent
ffcd527c4e
commit
a12442f4b4
@@ -7796,7 +7796,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
|
|||||||
|
|
||||||
string pidtmp = tmpdir + "/mysql.pid";
|
string pidtmp = tmpdir + "/mysql.pid";
|
||||||
|
|
||||||
int no_systemd = system("systemctl cat mariadb.server > /dev/null 2>&1");
|
int no_systemd = system("systemctl cat mariadb.service > /dev/null 2>&1");
|
||||||
|
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
@@ -7938,7 +7938,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
|
|||||||
FILE *cmd_pipe = popen("pidof -s mysqld", "r");
|
FILE *cmd_pipe = popen("pidof -s mysqld", "r");
|
||||||
|
|
||||||
fgets(buf, 512, cmd_pipe);
|
fgets(buf, 512, cmd_pipe);
|
||||||
pid_t pid = strtoul(buf, NULL, 10);
|
pid = strtoul(buf, NULL, 10);
|
||||||
|
|
||||||
pclose( cmd_pipe );
|
pclose( cmd_pipe );
|
||||||
|
|
||||||
@@ -7968,7 +7968,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
|
|||||||
FILE *cmd_pipe = popen("pidof -s mysqld", "r");
|
FILE *cmd_pipe = popen("pidof -s mysqld", "r");
|
||||||
|
|
||||||
fgets(buf, 512, cmd_pipe);
|
fgets(buf, 512, cmd_pipe);
|
||||||
pid_t pid = strtoul(buf, NULL, 10);
|
pid = strtoul(buf, NULL, 10);
|
||||||
|
|
||||||
pclose( cmd_pipe );
|
pclose( cmd_pipe );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user