Ori.livneh has submitted this change and it was merged.

Change subject: Set maximum execution time to 60 seconds
......................................................................


Set maximum execution time to 60 seconds

Last in a sequence of changes spanning I00e1a6c57, Ia5a30b7a0, and I1fa012ca1.

Bug: T97204
Change-Id: I00e1a6c57c673509443b8faefb361958b06c52d0
---
M modules/hhvm/manifests/init.pp
1 file changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Aaron Schulz: Looks good to me, but someone else must approve
  GWicke: Looks good to me, but someone else must approve



diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 809c260..eb29cdb 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -139,15 +139,9 @@
     }
 
 
-    # Specify a maximum execution time of 290 wall-clock seconds.
-    # This is scandalously high, but we must wean ourselves from
-    # bad habits in stages. -- Ori, 24-Apr-2015.
-    # Halved to 145. -- Ori, 29-Jul-2015
-    $max_execution_time = 145
-
     $fcgi_defaults = {
         memory_limit       => '500M',
-        max_execution_time => $max_execution_time,
+        max_execution_time => 60,
         hhvm         => {
             jit               => true,
             jit_a_size        => $a_size,

-- 
To view, visit https://gerrit.wikimedia.org/r/231197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I00e1a6c57c673509443b8faefb361958b06c52d0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to