xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Improve checking for running DB process

Browse Source
This commit is contained in:
Mark Gurevich 2023-02-17 12:20:14 -05:00
parent 6d4c948f44
commit a2440a2acc
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xCAT-client/bin/mysqlsetup
View File

@ -984,26 +984,25 @@ sub mysqlstart
exit(1);
}
# make sure service has started. On some OSes, mariadb service starts mysql daemon
# Make sure service has started. On some OSes, mariadb service starts mysql daemon
# on others, mariadb service starts mariadb daemon. Check a few times for one,
# then the other
my @db_service_name_list = ("mysqld", "mariadb");
foreach my $db_service_name (@db_service_name_list) {
$cmd = "ps -ef | grep $db_service_name | grep -v grep";
for (my $i = 0 ; $i < 6 ; $i++) {
my @output = xCAT::Utils->runcmd($cmd, 0);
my $mysqlcheck = $db_service_name;
my $mariadb_process_name = "mariadbd";
my $mysql_process_name = "mysqld";
my $db_process_name_pattern = "\'".$mariadb_process_name."\|".$mysql_process_name."\'";
for (my $i = 0 ; $i < 6 ; $i++) {
$cmd = "ps -ef | grep -E $db_process_name_pattern | grep -v grep";
my @output = xCAT::Utils->runcmd($cmd, 0);
if (grep(/$mysqlcheck/, @output)) {
sleep 10; # give a few extra seconds to be sure
return;
} else {
sleep 10; # wait for daemon
}
if (grep(/$mariadb_process_name/, @output) || grep(/$mysql_process_name/, @output)) {
sleep 10; # give a few extra seconds to be sure
return;
} else {
sleep 10; # wait for daemon
}
}
xCAT::MsgUtils->message("E",
" Could not start the mysql/mariadb daemon in time allocated (2 minutes)");
" Could not start the mysql/mariadb daemon in time allocated (1 minute)");
exit(1);
}