Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367409 )
Change subject: Revert "PDF Render: Check hourly if the service is running via
cron"
......................................................................
Revert "PDF Render: Check hourly if the service is running via cron"
This reverts commit 997c4cd612d8bc88bca80894d8eecccc79af96f1.
Change-Id: I97a9a78d3a06cddb36b00d949a7e84330920e1c1
---
M modules/pdfrender/manifests/init.pp
D modules/pdfrender/templates/cron.erb
2 files changed, 0 insertions(+), 61 deletions(-)
Approvals:
Volans: Verified; Looks good to me, approved
diff --git a/modules/pdfrender/manifests/init.pp
b/modules/pdfrender/manifests/init.pp
index edb80af..32cae42 100644
--- a/modules/pdfrender/manifests/init.pp
+++ b/modules/pdfrender/manifests/init.pp
@@ -147,25 +147,4 @@
systemd => true,
service_params => $params,
}
-
- # TODO: work-around for T159922
- # We put a script in the cron hourly directory to check whether the
- # service is running, and if it is not, it will try to restart it.
- # Note: we explicitly put it in /etc/cron.hourly/ instead of using the
- # Puppet cron resource as that makes it easier to remove it later
- if ($running) {
- file { '/etc/cron.hourly/pdfrender-check':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0755',
- content => template('pdfrender/cron.erb'),
- require => Base::Service_unit['pdfrender'],
- }
- } else {
- file { '/etc/cron.hourly/pdfrender-check':
- ensure => absent,
- }
- }
-
}
diff --git a/modules/pdfrender/templates/cron.erb
b/modules/pdfrender/templates/cron.erb
deleted file mode 100644
index 086d3db..0000000
--- a/modules/pdfrender/templates/cron.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# WARNING: This file is managed by Puppet, modifying it manually is futile
-
-check_cmd='curl http://localhost:<%= @port %> >/dev/null 2>&1';
-
-if ${check_cmd}; then
- # the service is up, we are done here
- exit 0;
-fi
-
-# since the service is down, first depool it
-/usr/local/bin/depool-pdfrender;
-
-# try to restart the service
-counter=10;
-while [[ ${counter} > 0 ]]; do
- /bin/systemctl stop pdfrender;
- sleep 12;
- /bin/systemctl start pdfrender;
- sleep 2;
- if ${check_cmd}; then
- # the service is up, we are done
- counter=-1;
- else
- # not done yet, we need another round
- (( counter-- ));
- fi
-done
-
-if [[ ${counter} == 0 ]]; then
- # bringing up the service failed, so echo something
- echo "[$(date)] Failed to bring pdfrender up, leaving it depooled!" >2;
- exit 1;
-fi
-
-# the service is now up, we are good to go, repool it
-/usr/local/bin/pool-pdfrender;
-exit 0;
-
--
To view, visit https://gerrit.wikimedia.org/r/367409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97a9a78d3a06cddb36b00d949a7e84330920e1c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
