mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 18:08:16 +00:00
Code Issues Releases Wiki Activity

[#3547] hammer.py: wait for start-stop-daemon/mysqld_safe to exit

Browse Source 
Attempt to fix `start-stop-daemon: /usr/bin/mysqld_safe is already running`
This commit is contained in:
Andrei Pavel 2024-08-22 10:23:46 +03:00
parent 18e9c20962
commit a08efdbafb
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hammer.py
View File

@ -426,6 +426,15 @@ def execute(cmd, timeout=60, cwd=None, env=None, raise_error=True, dry_run=False
return exitcode return exitcode
def wait_for_process_to_exit(process_name):
for _ in range(100):
exit_code = execute(f'sudo pidof {process_name}', raise_error=False)
if exit_code != 0:
# Process exited or there was no process to begin with.
break
time.sleep(1)
def _append_to_file(file_name, line): def _append_to_file(file_name, line):
with open(file_name, encoding='utf-8', mode='a') as f: with open(file_name, encoding='utf-8', mode='a') as f:
f.write(line + '\n') f.write(line + '\n')
@ -1371,7 +1380,9 @@ ssl_key = {cert_dir}/kea-client.key
execute('sudo sed -i "/^skip-networking$/d" /etc/my.cnf.d/mariadb-server.cnf') execute('sudo sed -i "/^skip-networking$/d" /etc/my.cnf.d/mariadb-server.cnf')
execute('sudo rc-update add mariadb') execute('sudo rc-update add mariadb')
execute('sudo rc-service mariadb stop') execute('sudo rc-service mariadb stop')
wait_for_process_to_exit('start-stop-daemon') # mysqld_safe
execute('sudo rc-service mariadb setup') execute('sudo rc-service mariadb setup')
wait_for_process_to_exit('start-stop-daemon') # mysqld_safe
execute('sudo rc-service mariadb restart') execute('sudo rc-service mariadb restart')
cmd = "echo 'DROP DATABASE IF EXISTS keatest;' | sudo mysql -u root" cmd = "echo 'DROP DATABASE IF EXISTS keatest;' | sudo mysql -u root"