[CalendarServer-changes] [8263] CalendarServer/trunk/twistedcaldav/upgrade.py

[source_changes at macosforge.org]

Revision: 8263
          http://trac.macosforge.org/projects/calendarserver/changeset/8263
Author:   sagen at apple.com
Date:     2011-11-08 14:36:03 -0800 (Tue, 08 Nov 2011)
Log Message:
-----------
Disable memcached access during upgradeData

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2011-11-08 22:02:37 UTC (rev 8262)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2011-11-08 22:36:03 UTC (rev 8263)
@@ -894,8 +894,17 @@
 
         @return: a Deferred which fires when the upgrade is complete.
         """
+
+        # Don't try to use memcached during upgrade; it's not necessarily
+        # running yet.
+        memcacheEnabled = self.config.Memcached.Pools.Default.ClientEnabled
+        self.config.Memcached.Pools.Default.ClientEnabled = False
+
         yield upgradeData(self.config)
 
+        # Restore memcached client setting
+        self.config.Memcached.Pools.Default.ClientEnabled = memcacheEnabled
+
         # see http://twistedmatrix.com/trac/ticket/4649
         reactor.callLater(0, self.wrappedService.setServiceParent, self.parent)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111108/14355cf6/attachment.html>