[CalendarServer-changes] [8397] CalendarServer/branches/users/glyph/parallel-upgrade/txdav/common/ datastore/upgrade/migrate.py

[source_changes at macosforge.org]

Revision: 8397
          http://trac.macosforge.org/projects/calendarserver/changeset/8397
Author:   glyph at apple.com
Date:     2011-12-03 00:40:01 -0800 (Sat, 03 Dec 2011)
Log Message:
-----------
improved logging

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/parallel-upgrade/txdav/common/datastore/upgrade/migrate.py

Modified: CalendarServer/branches/users/glyph/parallel-upgrade/txdav/common/datastore/upgrade/migrate.py
===================================================================
--- CalendarServer/branches/users/glyph/parallel-upgrade/txdav/common/datastore/upgrade/migrate.py	2011-12-03 08:39:52 UTC (rev 8396)
+++ CalendarServer/branches/users/glyph/parallel-upgrade/txdav/common/datastore/upgrade/migrate.py	2011-12-03 08:40:01 UTC (rev 8397)
@@ -258,7 +258,8 @@
                 self = cls(
                     FileStore(path, None, True, True,
                               propertyStoreClass=appropriateStoreClass),
-                    store, service, uid=uid, gid=gid, spawner=spawner
+                    store, service, uid=uid, gid=gid,
+                    parallel=parallel, spawner=spawner,
                 )
                 return self
         return service
@@ -285,7 +286,8 @@
         """
         migrateFunc, destFunc = homeTypeLookup.get(homeType)
         uid = fileHome.uid()
-        self.log_warn("Migrating %s UID %r" % (homeType, uid))
+        self.log_warn("Starting migration transaction %s UID %r" %
+                      (homeType, uid))
         sqlTxn = self.sqlStore.newTransaction()
         homeGetter = destFunc(sqlTxn)
         if (yield homeGetter(uid, create=False)) is not None:
@@ -317,7 +319,8 @@
         self.sqlStore.setMigrating(True)
         parallel = self.parallel
         if parallel:
-            self.log_warn("Starting upgrade helper processes.")
+            self.log_warn("Starting %d upgrade helper processes." %
+                          (parallel,))
             spawner = self.spawner
             spawner.startService()
             drivers = []
@@ -354,9 +357,12 @@
                     busy = drivers.pop(0)
                     d = busy.oneUpgrade(fileHome.uid(), homeType)
                     inParallel.append(d)
-                    def freeUp(result, d=d, busy=busy):
+                    def freeUp(result, d=d, busy=busy, uid=uid,
+                               homeType=homeType):
                         inParallel.remove(d)
                         drivers.append(busy)
+                        self.log_warn("Completed migration of %s uid %r" %
+                                      (homeType, uid))
                         return result
                     d.addBoth(freeUp)
                 else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111203/7044ddb5/attachment.html>