From 9605c951dc1b2fab3e5f5bcf8b3e5b8b551be005 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Mon, 17 Feb 2020 09:53:02 +0000 Subject: [PATCH] MCOL-3793 Fix UM ACTIVE / DEGRADED flip-flop OAM mysqld status check was recording the pid of mysqld but this was being masked by another variable. So on every ACTIVE check it would flip to DEGRADED and on every DEGRADED check it would flip to ACTIVE. Variable masking is now removed. Also fixed a typo in the systemd check. --- oam/oamcpp/liboamcpp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index c0a020a10..1a02a9cb9 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -7796,7 +7796,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action) 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) { @@ -7938,7 +7938,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action) FILE *cmd_pipe = popen("pidof -s mysqld", "r"); fgets(buf, 512, cmd_pipe); - pid_t pid = strtoul(buf, NULL, 10); + pid = strtoul(buf, NULL, 10); pclose( cmd_pipe ); @@ -7968,7 +7968,7 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action) FILE *cmd_pipe = popen("pidof -s mysqld", "r"); fgets(buf, 512, cmd_pipe); - pid_t pid = strtoul(buf, NULL, 10); + pid = strtoul(buf, NULL, 10); pclose( cmd_pipe );