Merge lp:~facundo/ubuntuone-client/lr-file-deletion-564774 into lp:ubuntuone-client

[Facundo Batista]

Don't delete the file in an interrupted download with lost partial.

Don't delete the file in an interrupted download with lost partial.

Test included.

[Tim Cole (tcole)]

Looks like an improvement, I think.

review: Approve

[John O'Brien (jdobrien)]

Good test. Tests pass in client and integration tests.

review: Approve

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-04-12 19:29:50 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-04-16 17:23:17 +0000
@@ -1484,6 +1484,31 @@
         self.startTest(check)
         return self.deferred
 
+    def test_SERVER_no_file(self):
+        """We just queued the Download, and it was interrupted."""
+        # create the file in metadata
+        path = os.path.join(self.share.path, "a")
+        mdid = self.fsm.create(path, self.share.volume_id, is_dir=False, node_id="uuid")
+        partial_path = os.path.join(self.fsm.partials_dir,
+                                mdid + ".u1partial." + os.path.basename(path))
+
+        # this mimic Sync.get_file
+        self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
+        self.fsm.create_partial("uuid", self.share.volume_id)
+
+        # now, for some reason, we lose the partial file
+        os.remove(partial_path)
+
+        def check(_):
+            """arrange the metadata so later server_rescan will do ok"""
+            self.assertEqual(self.eq.pushed, [])
+            mdobj = self.fsm.get_by_mdid(mdid)
+            self.assertFalse(mdobj.info.is_partial)
+            self.assertEqual(mdobj.server_hash, mdobj.local_hash)
+
+        self.startTest(check)
+        return self.deferred
+
     def test_SERVER_file_content(self):
         """We were downloading the file, but it was interrupted, and changed"""
         # create the file in metadata

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2010-04-12 19:29:50 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2010-04-16 17:23:17 +0000
@@ -507,17 +507,25 @@
                     else:
                         events.append(('FS_FILE_DELETE', fullname))
             else:
-                if changed not in ("SERVER", "NONE", "LOCAL"):
+                if changed == 'SERVER':
+                    # download interruped and partial lost
+                    log_debug("comp yield: file %r not in disk, in SERVER "
+                              "state, without partial!", 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)
+                elif changed in ('NONE', 'LOCAL'):
+                    # if it had content somewhen, now is really gone (otherwise
+                    # it was never really created in the disk)
+                    log_info("comp yield: file %r is gone!", fullname)
+                    events.append(('FS_FILE_DELETE', fullname))
+                else:
                     # bad metadata
                     m = "Bad 'changed': removing MD from file %r"
                     log_debug(m, fullname)
                     self.fsm.delete_metadata(fullname)
-                    continue
 
-                # if it had content somewhen, now is gone (otherwise it was
-                # never really created in the disk)
-                log_info("comp yield: file %r is gone!", fullname)
-                events.append(('FS_FILE_DELETE', fullname))
         return events, to_scan_later
 
     def _paths_filter(self, shrinfo, dirpath, len_shr_path):