openstack/trove
Code Issues Proposed changes

Merge "MySQL restore wait for shutdown before killing"

Browse Source
This commit is contained in:
Jenkins
2015-01-28 10:27:14 +00:00
committed by Gerrit Code Review
parent c7cb6ef711 0a0da897a3
commit 23a682b89d
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trove/guestagent/strategies/restore/mysql_impl.py
View File

@@ -82,8 +82,18 @@ class MySQLRestoreMixin(object):
LOG.debug("Cleaning up the temp mysqld process.")
utils.execute_with_timeout("mysqladmin", "-uroot",
"--protocol=tcp", "shutdown")
LOG.debug("Polling for shutdown to complete.")
try:
utils.poll_until(self.mysql_is_not_running,
sleep_time=self.RESET_ROOT_SLEEP_INTERVAL,
time_out=self.RESET_ROOT_RETRY_TIMEOUT)
LOG.debug("Database successfully shutdown")
except exception.PollTimeOut:
LOG.debug("Timeout shutting down database "
"- performing killall on mysqld_safe.")
utils.execute_with_timeout("killall", "mysqld_safe",
root_helper="sudo", run_as_root=True)
root_helper="sudo",
run_as_root=True)
self.poll_until_then_raise(
self.mysql_is_not_running,
base.RestoreError("Reset root password failed: "