Merge lp:~dobey/ubuntuone-client/fix-getdelta-3-0 into lp:ubuntuone-client/stable-3-0

[dobey]

Use PathLockTree to get one GetDelta at a time.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2012-04-24 20:47:43 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-05-16 22:12:18 +0000
@@ -4478,6 +4478,15 @@
         cmd = GetDelta(self.rq, 'vol', 1)
         self.assertEqual(cmd.uniqueness, ('GetDelta', 'vol'))
 
+    def test_path_locking(self):
+        """Test that it acquires correctly the path lock."""
+        t = []
+        self.patch(PathLockingTree, 'acquire',
+                   lambda s, *a, **k: t.extend((a, k)))
+        cmd = GetDelta(self.rq, 'volume_id', 123)
+        cmd._acquire_pathlock()
+        self.assertEqual(t, [('GetDelta', 'volume_id'), {'logger': None}])
+
 
 class GetDeltaFromScratchTestCase(ConnectedBaseTestCase):
     """Test for GetDelta ActionQueueCommand."""

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2012-04-24 18:56:40 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-05-16 22:12:18 +0000
@@ -2070,6 +2070,12 @@
         self.log = mklog(logger, 'GetDelta', self.volume_id,
                          None, generation=self.generation)
 
+    def _acquire_pathlock(self):
+        """Acquire pathlock."""
+        pathlock = self.action_queue.pathlock
+        return pathlock.acquire('GetDelta', str(self.volume_id),
+                                logger=self.log)
+
 
 class GetDeltaFromScratch(ActionQueueCommand):
     """Get a delta from scratch."""