Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347345 )
Change subject: Use pgrep -c as we don't care about the output
......................................................................
Use pgrep -c as we don't care about the output
Change-Id: I72cdcf3ed88e1a9dd86257a664ac969d516072c8
---
M switchdc/stages/t01_stop_maintenance.py
1 file changed, 1 insertion(+), 1 deletion(-)
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 f275f54..9e2a9a4 100644
--- a/switchdc/stages/t01_stop_maintenance.py
+++ b/switchdc/stages/t01_stop_maintenance.py
@@ -39,7 +39,7 @@
# We just log an error, don't actually report a failure to the system. We
can live with this.
try:
- remote.sync('pgrep php', is_safe=True)
+ remote.sync('pgrep -c php', is_safe=True)
logger.error('Stray php processes still present on the maintenance
host, please check')
except RemoteExecutionError:
pass
--
To view, visit https://gerrit.wikimedia.org/r/347345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72cdcf3ed88e1a9dd86257a664ac969d516072c8
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