[CalendarServer-changes] [6267] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 6267
          http://trac.macosforge.org/projects/calendarserver/changeset/6267
Author:   sagen at apple.com
Date:     2010-09-09 15:25:03 -0700 (Thu, 09 Sep 2010)
Log Message:
-----------
Disable auto-migration of locations and resources until it can be made faster.

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

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2010-09-09 21:00:21 UTC (rev 6266)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2010-09-09 22:25:03 UTC (rev 6267)
@@ -304,7 +304,7 @@
                 }
             },
             ".calendarserver_version" : {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             MailGatewayTokensDatabase.dbFilename : { "@contents" : None },
             "%s-journal" % (MailGatewayTokensDatabase.dbFilename,) : { "@contents" : None },
@@ -383,7 +383,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -503,7 +503,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -595,7 +595,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -689,7 +689,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -768,7 +768,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -884,7 +884,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -1004,7 +1004,7 @@
             },
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             "calendars" :
             {
@@ -1192,7 +1192,7 @@
         after = {
             ".calendarserver_version" :
             {
-                "@contents" : "2",
+                "@contents" : "1",
             },
             NEWPROXYFILE :
             {

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2010-09-09 21:00:21 UTC (rev 6266)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2010-09-09 22:25:03 UTC (rev 6267)
@@ -505,7 +505,7 @@
 
 upgradeMethods = [
     (1, upgrade_to_1),
-    (2, upgrade_to_2),
+    # (2, upgrade_to_2), # This is too slow for large installations
 ]
 
 @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100909/3ef2a72a/attachment.html>