openstack/trove
Code Issues Proposed changes

Merge "Restore should use pgrep instead of mysqladmin to check for mysql down"

Browse Source
This commit is contained in:
Jenkins 2013-07-03 21:56:51 +00:00 committed by Gerrit Code Review
commit 64e91bb8a6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
trove/guestagent/strategies/restore/base.py
View File

@ -38,20 +38,31 @@ FLUSH PRIVILEGES;
""" """
def mysql_is_running(): def exec_with_root_helper(*cmd):
try: try:
out, err = utils.execute_with_timeout( out, err = utils.execute_with_timeout(
"/usr/bin/mysqladmin", *cmd, run_as_root=True, root_helper="sudo")
"ping", run_as_root=True, root_helper="sudo")
LOG.info("The mysqld daemon is up and running.")
return True return True
except exception.ProcessExecutionError: except exception.ProcessExecutionError:
return False
def mysql_is_running():
if exec_with_root_helper("/usr/bin/mysqladmin", "ping"):
LOG.info("The mysqld daemon is up and running.")
return True
else:
LOG.info("The mysqld daemon is not running.") LOG.info("The mysqld daemon is not running.")
return False return False
def mysql_is_not_running(): def mysql_is_not_running():
return not mysql_is_running() if exec_with_root_helper("/usr/bin/pgrep", "mysqld"):
LOG.info("The mysqld daemon is still running.")
return False
else:
LOG.info("The mysqld daemon is not running.")
return True
def poll_until_then_raise(event, exception): def poll_until_then_raise(event, exception):