Merge lp:~verterok/ubuntuone-client/fix-869920 into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix creation of volumes (with content) by adding a new "volatile" variable to signal when the volume is being processes by local rescan.

Fix creation of volumes (with content) by adding a new "volatile" variable to signal when the volume is being processes by local rescan.

[Joshua Hoover (joshuahoover)]

Test from bug #869920 passed using this branch.

review: Approve (tested)

[Facundo Batista (facundo)]

+1

review: Approve

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2011-11-02 16:51:32 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2011-12-12 21:07:26 +0000
@@ -1559,6 +1559,7 @@
         info = yield d
 
         udf.subscribed = True
+        udf.local_rescanning = False
         self.assertEqual(get_udf_dict(udf), info)
 
     @defer.inlineCallbacks
@@ -1589,6 +1590,7 @@
         info = yield d
 
         udf.subscribed = False
+        udf.local_rescanning = False
         self.assertEqual(get_udf_dict(udf), info)
 
     @defer.inlineCallbacks
@@ -1648,6 +1650,7 @@
         info = yield d
 
         share.subscribed = True
+        share.local_rescanning = False
         self.assertEqual(get_share_dict(share), info)
 
     @defer.inlineCallbacks
@@ -1678,6 +1681,7 @@
         info = yield d
 
         share.subscribed = False
+        share.local_rescanning = False
         self.assertEqual(get_share_dict(share), info)
 
     @defer.inlineCallbacks
 
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-11-30 19:54:45 +0000
+++ tests/syncdaemon/test_vm.py	2011-12-12 21:07:26 +0000
@@ -1462,6 +1462,34 @@
                       'watch for %r should be present.' % udf.path)
 
     @defer.inlineCallbacks
+    def test_add_udf_with_content(self):
+        """Test for VolumeManager.add_udf with content on disk."""
+        # create a sync instance
+        from ubuntuone.syncdaemon import sync
+        sync = sync.Sync(self.main)
+        suggested_path = u"~/suggested_path"
+        udf = self._create_udf(suggested_path=suggested_path,
+                               subscribed=True)
+        # create some files inside it
+        make_dir(udf.path)
+        for i in range(10):
+            with open_file(os.path.join(udf.path, 'file_%d' % (i,)), 'wb') as f:
+                f.write(os.urandom(10))
+        self.assertEqual(len(os.listdir(udf.path)), 10)
+        # patch the fake action queue to intercept make_file calls
+        called = []
+        self.main.action_q.make_file = lambda *a: called.append(a)
+        yield self.vm.add_udf(udf)
+        self.assertEqual(len(called), 10)
+        # check that the UDF is in the fsm metadata
+        mdobj = self.main.fs.get_by_path(udf.path)
+        self.assertEqual(mdobj.node_id, udf.node_id)
+        self.assertEqual(mdobj.share_id, udf.volume_id)
+        # check that there is a watch in the UDF
+        self.assertIn(udf.path, self.watches,
+                      'watch for %r should be present.' % udf.path)
+
+    @defer.inlineCallbacks
     def test_add_udf_calls_AQ(self):
         """Test that VolumeManager.add_udf calls AQ.rescan_from_scratch."""
         udf = self._create_udf(subscribed=True)
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-11-17 14:49:05 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-12-12 21:07:26 +0000
@@ -120,8 +120,12 @@
 
     # default generation for all volumes without a value in the metadata
     generation = None
+    # transient value used in local rescan during resubscribe. Set it always to
+    # False no matter what is passed to the constructor
+    local_rescanning = False
 
-    def __init__(self, volume_id, node_id, generation=None, subscribed=False):
+    def __init__(self, volume_id, node_id, generation=None, subscribed=False,
+                 local_rescanning=None):
         """Create the volume."""
         # id and node_id should be str or None
         assert isinstance(volume_id, basestring) or volume_id is None
@@ -231,7 +235,7 @@
     @property
     def active(self):
         """Return True if this Share is accepted."""
-        return self.accepted and self.subscribed
+        return self.accepted and self.subscribed and not self.local_rescanning
 
     def __eq__(self, other):
         result = (super(Share, self).__eq__(other) and
@@ -347,7 +351,7 @@
     @property
     def active(self):
         """Returns True if the UDF is subscribed."""
-        return self.subscribed
+        return self.subscribed and not self.local_rescanning
 
     @classmethod
     def from_udf_volume(cls, udf_volume, path):
@@ -862,13 +866,13 @@
             self._create_share_dir(share)
             self.log.debug('add_share: volume active, temporarly unsubscribe '
                            'to rescan (scan_local? %r).', share.can_write())
-            share.subscribed = False
+            share.local_rescanning = True
             self.shares[share.volume_id] = share
 
             def subscribe(result):
                 """Subscribe the share after the local rescan."""
                 volume = self.get_volume(share.volume_id)
-                volume.subscribed = True
+                volume.local_rescanning = False
                 self.store_volume(volume)
                 return result
 
@@ -1090,7 +1094,7 @@
             if udf.subscribed:
                 self.log.debug('add_udf: volume subscribed, '
                                'temporarly unsubscribe to do local rescan.')
-                udf.subscribed = False
+                udf.local_rescanning = True
                 self.udfs[udf.volume_id] = udf
                 if not path_exists(udf.path):
                     make_dir(udf.path, recursive=True)
@@ -1103,7 +1107,7 @@
 
                     """
                     volume = self.get_volume(udf.volume_id)
-                    volume.subscribed = True
+                    volume.local_rescanning = False
                     self.store_volume(volume)
                     return result
 
@@ -1278,11 +1282,14 @@
 
             """
             volume = self.get_volume(volume_id)
+            volume.local_rescanning = False
+            self.store_volume(volume)
+            return result
+
+        try:
             volume.subscribed = True
+            volume.local_rescanning = True
             self.store_volume(volume)
-            return result
-
-        try:
             d = self._scan_volume(volume, scan_local=volume.can_write())
         except KeyError, e:
             push_error(error="METADATA_DOES_NOT_EXIST")