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

[Guillermo Gonzalez]

Fix Local rescan to process read only shares and resume interrupted downloads.

Local rescan now process read only shares and resume interrupted downloads.

[Facundo Batista (facundo)]

I would use local vars for self.fsm.changed and self.fsm.CHANGED_SERVER instead of accessing self and fsm (twice) inside the double for.

Otherwise, it's ok.

review: Approve

[Guillermo Gonzalez (verterok)]

good point, fixed and pushed.

[lp:~verterok/ubuntuone-client/fix-598189]

689. By Guillermo Gonzalez on 2010-09-13

avoid dict lookups in the nested for loop

[John O'Brien (jdobrien)]

Tests say [OK] and I do too.

review: Approve

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-09-07 19:41:16 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-09-13 16:08:46 +0000
@@ -1894,6 +1894,78 @@
         self.startTest(check)
         return self.deferred
 
+    def test_SERVER_file_ro_share(self):
+        """We were downloading the file, but it was interrupted in RO share."""
+        # create the file in metadata
+        ro_share = self.create_share('share_ro_id', 'share_ro2',  self.fsm,
+                                       self.shares_dir, access_level='View')
+        self.fsm.create(ro_share.path, ro_share.id, is_dir=True)
+        self.fsm.set_node_id(ro_share.path, "uuidshare")
+        path = os.path.join(ro_share.path, "a")
+        with self.fsm._enable_share_write(ro_share.id, path):
+            open(path, "w").close()
+        mdid = self.fsm.create(path, ro_share.volume_id, is_dir=False)
+        partial_path = os.path.join(self.fsm.partials_dir,
+                                mdid + ".u1partial." + os.path.basename(path))
+        self.fsm.set_node_id(path, "uuid")
+
+        # start the download, never complete it
+        self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
+        self.fsm.create_partial("uuid", ro_share.volume_id)
+        fh = self.fsm.get_partial_for_writing("uuid", ro_share.volume_id)
+        fh.write("foobar")
+        self.assertTrue(os.path.exists(partial_path))
+
+        def check(_):
+            """Compare predictable args, and check fh factory."""
+            mdobj = self.fsm.get_by_mdid(mdid)
+            self.assertEqual(self.aq.downloaded[:3], (
+                             mdobj.share_id, mdobj.node_id, mdobj.server_hash))
+            factory = self.aq.downloaded[-1]
+            self.assertTrue(isinstance(factory(), file))
+            self.assertTrue(self.handler.check_debug("comp yield", "SERVER"))
+
+        self.startTest(check)
+        return self.deferred
+
+    def test_SERVER_dir_ro_share(self):
+        """Found a dir in SERVER in a ro_share.
+
+        This was valid before, but no more, so we just fix and log in warning.
+        """
+        # create the dir in metadata
+        ro_share = self.create_share('share_ro_id', 'share_ro2',  self.fsm,
+                                       self.shares_dir, access_level='View')
+        self.fsm.create(ro_share.path, ro_share.id, is_dir=True)
+        self.fsm.set_node_id(ro_share.path, "uuidshare")
+
+        path = os.path.join(ro_share.path, "a")
+        mdid = self.fsm.create(path, ro_share.volume_id, is_dir=True)
+        partial_path = os.path.join(self.fsm.partials_dir,
+                                mdid + ".u1partial." + os.path.basename(path))
+        self.fsm.set_node_id(path, "uuid")
+
+        # start the download, never complete it
+        self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
+        self.fsm.create_partial("uuid", ro_share.volume_id)
+        fh = self.fsm.get_partial_for_writing("uuid", ro_share.volume_id)
+        fh.write("foobar")
+        self.assertTrue(os.path.exists(partial_path))
+
+        def check(_):
+            """Several checks."""
+            mdobj = self.fsm.get_by_mdid(mdid)
+            # it should be in NONE
+            self.assertFalse(mdobj.info.is_partial)
+            self.assertEqual(mdobj.server_hash, mdobj.local_hash)
+            self.assertFalse(os.path.exists(partial_path))
+            # logged in warning
+            self.assertTrue(self.handler.check_warning(
+                                                "Found a directory in SERVER"))
+
+        self.startTest(check)
+        return self.deferred
+
 
 class RootBadStateTests(TwistedBase):
     """Test what happens with volume roots left in a bad state last time."""

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2010-09-07 19:41:16 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2010-09-13 16:08:46 +0000
@@ -76,6 +76,7 @@
         # first of all, remove old partials and clean trash
         self._remove_partials()
         self._process_limbo()
+        self._process_ro_shares()
 
         yield self._queue_scan()
         self._show_broken_nodes()
@@ -129,6 +130,27 @@
             self.aq.move(share_id, node_id, old_parent_id,
                          new_parent_id, new_name)
 
+    def _process_ro_shares(self):
+        """Process ro shares and reschedule interrupted downloads."""
+        # to avoid the lookups in the nested for
+        changed = self.fsm.changed
+        CHANGED_SERVER = self.fsm.CHANGED_SERVER
+        for share in self._get_volumes(all_volumes=False, access_level="View"):
+            for mdobj in self.fsm.get_mdobjs_by_share_id(share.id):
+                if changed(mdid=mdobj.mdid) == CHANGED_SERVER:
+                    fullname = os.path.join(share.path, mdobj.path)
+                    if mdobj.is_dir:
+                        # old state, no sense now with generations
+                        # but required for the migration path.
+                        log_warning("Found a directory in SERVER: %r", fullname)
+                        mdobj = self.fsm.get_by_path(fullname)
+                        self.fsm.set_by_mdid(mdobj.mdid,
+                                             server_hash=mdobj.local_hash)
+                        self.fsm.remove_partial(mdobj.node_id, mdobj.share_id)
+                    else:
+                        log_debug("comp yield: file %r in SERVER", fullname)
+                        self._resume_download(fullname)
+
     def _show_broken_nodes(self):
         """Log the broken nodes."""
         for mdobj in self.fsm.get_dirty_nodes():