Asher has submitted this change and it was merged.
Change subject: Revert "use twemproxy on all apaches"
......................................................................
Revert "use twemproxy on all apaches"
This reverts commit 9fc6039128c64f428e8a2293df74d74be3c72180
Change-Id: Idb7e6ce1aee2c9a3d2558cc363d79b3b000c0b7c
---
M wmf-config/mc-eqiad.php
M wmf-config/mc-pmtpa.php
2 files changed, 11 insertions(+), 31 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/mc-eqiad.php b/wmf-config/mc-eqiad.php
index 6eb2ad9..c13ba18 100644
--- a/wmf-config/mc-eqiad.php
+++ b/wmf-config/mc-eqiad.php
@@ -10,20 +10,16 @@
# rather a consistent hash based on key and server addresses,
# so the ordering of servers is not important. Additionally, the
# number of servers can grow/shrink without *too* much disruption.
-
-# Use twemproxy for memcached access - see twemproxy-eqiad.yaml
-# NOTE: after deploying a new twemproxy.yaml config, run restart-twemproxy
-# from the deploy host to make it live.
-$wgObjectCaches['memcached-pecl'] = array(
- 'class' => 'MemcachedPeclBagOStuff',
- 'serializer' => 'igbinary',
- 'persistent' => true,
- 'servers' => array( '127.0.0.1' ),
- 'server_failure_limit' => 0,
- 'retry_timeout' => 0
-);
-
-/*** No Twemproxy
+if (strpos(gethostname(), "mw113") !== false ) {
+ $wgObjectCaches['memcached-pecl'] = array(
+ 'class' => 'MemcachedPeclBagOStuff',
+ 'serializer' => 'igbinary',
+ 'persistent' => true,
+ 'servers' => array( '127.0.0.1' ),
+ 'server_failure_limit' => 0,
+ 'retry_timeout' => 0
+ );
+} else {
$wgObjectCaches['memcached-pecl'] = array(
'class' => 'MemcachedPeclBagOStuff',
'serializer' => 'igbinary',
@@ -46,6 +42,5 @@
'10.64.0.195',
)
);
-***/
-
+}
# vim: set sts=4 sw=4 et :
diff --git a/wmf-config/mc-pmtpa.php b/wmf-config/mc-pmtpa.php
index 25d4306..41adcd0 100644
--- a/wmf-config/mc-pmtpa.php
+++ b/wmf-config/mc-pmtpa.php
@@ -10,20 +10,6 @@
# rather a consistent hash based on key and server addresses,
# so the ordering of servers is not important. Additionally, the
# number of servers can grow/shrink without *too* much disruption.
-
-# Use twemproxy for memcached access - see twemproxy-pmtpa.yaml
-# NOTE: after deploying a new twemproxy.yaml config, run restart-twemproxy
-# from the deploy host to make it live.
-$wgObjectCaches['memcached-pecl'] = array(
- 'class' => 'MemcachedPeclBagOStuff',
- 'serializer' => 'igbinary',
- 'persistent' => true,
- 'servers' => array( '127.0.0.1' ),
- 'server_failure_limit' => 0,
- 'retry_timeout' => 0
-);
-
-/*** No Twemproxy
$wgObjectCaches['memcached-pecl'] = array(
'class' => 'MemcachedPeclBagOStuff',
'serializer' => 'igbinary',
@@ -46,6 +32,5 @@
'10.0.12.16',
)
);
-***/
# vim: set sts=4 sw=4 et :
--
To view, visit https://gerrit.wikimedia.org/r/68318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb7e6ce1aee2c9a3d2558cc363d79b3b000c0b7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
