Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347344 )
Change subject: Verify jobrunner is stopped on the videoscalers as well
......................................................................
Verify jobrunner is stopped on the videoscalers as well
Change-Id: Ib410b8f660b4b40943c19611151d377a09fd84ab
---
M switchdc/stages/t01_stop_maintenance.py
M switchdc/stages/t09_start_maintenance.py
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/switchdc/stages/t01_stop_maintenance.py
b/switchdc/stages/t01_stop_maintenance.py
index 469a21f..f275f54 100644
--- a/switchdc/stages/t01_stop_maintenance.py
+++ b/switchdc/stages/t01_stop_maintenance.py
@@ -24,6 +24,9 @@
remote.select(jobrunners)
remote.async('! service jobrunner status > /dev/null', '! service jobchron
status > /dev/null', is_safe=True)
+ remote.select(videoscalers)
+ remote.async('status jobrunner | grep -qv running', 'status jobchron |
grep -qv running')
+
# 2: disable and kill cronjobs
logger.info('Disabling MediaWiki cronjobs in %s', dc_from)
remote.select('R:class = role::mediawiki::maintenance')
diff --git a/switchdc/stages/t09_start_maintenance.py
b/switchdc/stages/t09_start_maintenance.py
index 8dfda26..8dbfc48 100644
--- a/switchdc/stages/t09_start_maintenance.py
+++ b/switchdc/stages/t09_start_maintenance.py
@@ -23,6 +23,8 @@
remote.select(jobrunners)
remote.async('service jobrunner status > /dev/null', 'service jobchron
status > /dev/null', is_safe=True)
+ remote.select(videoscalers)
+ remote.async('status jobrunner | grep -q running', 'status jobchron | grep
-q running')
# Verify that the crontab has entries
remote.select(maintenance)
remote.sync('test "$(crontab -u www-data -l | sed -r \'/^(#|$)/d\')"',
is_safe=True)
--
To view, visit https://gerrit.wikimedia.org/r/347344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib410b8f660b4b40943c19611151d377a09fd84ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/switchdc
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
