[MediaWiki-commits] [Gerrit] Make ForkController destroy redis instances too - change (mediawiki/core)

2015-12-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Make ForkController destroy redis instances too
..


Make ForkController destroy redis instances too

Bug: T85565
Change-Id: I79e1b6aab30ef8ddfee2dd4f5f41e991562dbf13
---
M includes/ForkController.php
M includes/clientpool/RedisConnectionPool.php
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/includes/ForkController.php b/includes/ForkController.php
index c1765e2..4a021ee 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -153,7 +153,9 @@
wfGetLBFactory()->destroyInstance();
FileBackendGroup::destroySingleton();
LockManagerGroup::destroySingletons();
+   JobQueueGroup::destroySingletons();
ObjectCache::clear();
+   RedisConnectionPool::destroySingletons();
$wgMemc = null;
}
 
diff --git a/includes/clientpool/RedisConnectionPool.php 
b/includes/clientpool/RedisConnectionPool.php
index 64db0d6..1b9f9b3 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -167,6 +167,14 @@
}
 
/**
+* Destroy all singleton() instances
+* @since 1.27
+*/
+   public static function destroySingletons() {
+   self::$instances = array();
+   }
+
+   /**
 * Get a connection to a redis server. Based on code in 
RedisBagOStuff.php.
 *
 * @param string $server A hostname/port combination or the absolute 
path of a UNIX socket.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79e1b6aab30ef8ddfee2dd4f5f41e991562dbf13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make ForkController destroy redis instances too - change (mediawiki/core)

2015-12-04 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257059

Change subject: Make ForkController destroy redis instances too
..

Make ForkController destroy redis instances too

Bug: T85565
Change-Id: I79e1b6aab30ef8ddfee2dd4f5f41e991562dbf13
---
M includes/ForkController.php
M includes/clientpool/RedisConnectionPool.php
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/257059/1

diff --git a/includes/ForkController.php b/includes/ForkController.php
index c1765e2..4a021ee 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -153,7 +153,9 @@
wfGetLBFactory()->destroyInstance();
FileBackendGroup::destroySingleton();
LockManagerGroup::destroySingletons();
+   JobQueueGroup::destroySingletons();
ObjectCache::clear();
+   RedisConnectionPool::destroySingletons();
$wgMemc = null;
}
 
diff --git a/includes/clientpool/RedisConnectionPool.php 
b/includes/clientpool/RedisConnectionPool.php
index 64db0d6..1b9f9b3 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -167,6 +167,14 @@
}
 
/**
+* Destroy all singleton() instances
+* @since 1.27
+*/
+   public static function destroySingletons() {
+   self::$instances = array();
+   }
+
+   /**
 * Get a connection to a redis server. Based on code in 
RedisBagOStuff.php.
 *
 * @param string $server A hostname/port combination or the absolute 
path of a UNIX socket.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79e1b6aab30ef8ddfee2dd4f5f41e991562dbf13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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