Faidon has submitted this change and it was merged.

Change subject: contint: Disable php-apc on gallium
......................................................................


contint: Disable php-apc on gallium

Also cleaned up inconsistent whitespace from 803d066.

APC is routinely causing false-positives through various php fatal errors
on gallium because it can't keep up with the large number of changes to
files all the time. Caching probably doesn't gain that much anyway since
the files are recreated and changes after every build.

A few recent samples of these ludicrous errors:

- Fatal error: Class 'MediaWiki' not found in index.php
- Fatal error: Class 'Title' not found in languages/Language.php
- Fatal error: require(): Cannot redeclare class page in includes/AutoLoader.php
- Fatal error: Class 'UnlistedSpecialPage' not found in 
includes/specials/SpecialBlankpage.php

Change-Id: I7505ae0665f6f989a67b5580e4bf0f7fca464221
---
M manifests/site.pp
M modules/contint/manifests/packages.pp
2 files changed, 11 insertions(+), 6 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 65e254e..365da8a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1003,11 +1003,11 @@
                require => File['/srv/ssd'],
        }
 
-  # FIXME requested by hashar to debug out an issue
-  # with Jenkins (bug 48025)
-  package { 'pstack':
-    ensure => present,
-  }
+       # FIXME requested by hashar to debug out an issue
+       # with Jenkins (bug 48025)
+       package { 'pstack':
+               ensure => present,
+       }
 
        install_certificate{ "star.mediawiki.org": }
        install_certificate{ "star.wikimedia.org": }
diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 832d24d..cfb1d66 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -32,7 +32,6 @@
 
   # PHP related packages
   package { [
-    'php-apc',
     'php-pear',
     'php5-cli',
     'php5-curl',
@@ -120,4 +119,10 @@
     ensure => present,
   }
 
+  # Uninstalled packages
+  package { [
+    'php-apc',
+    ]: ensure => absent,
+  }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7505ae0665f6f989a67b5580e4bf0f7fca464221
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to