Merge lp:~chipaca/ubuntuone-client/improv-v2-upgrade into lp:ubuntuone-client

[John Lenton]

fixes #405688

[John Lenton (chipaca)]

This fixes #405688, by being a lot more cautious in moving around conflicts and partials. If anybody can think of more cases for the tests, please let me know :)

[Eric Casteleijn (thisfred)]

Indeed it does! +1

review: Approve

[Guillermo Gonzalez (verterok)]

yessir

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2009-08-25 18:26:17 +0000
+++ tests/syncdaemon/test_vm.py	2009-08-27 16:41:47 +0000
@@ -562,6 +562,162 @@
         self.assertTrue(os.path.exists(self.shares_dir + '/.u1partial.bar'))
         self.assertTrue(os.path.exists(self.shares_dir + '/baz/baz.u1conflict'))
 
+    def test_2_to_3_more(self):
+        """ Test the upgrade from v.2 of the metadata to v.3 some more"""
+        vm_data_dir = os.path.join(self.data_dir, 'vm')
+        os.makedirs(vm_data_dir)
+        with open(os.path.join(vm_data_dir, '.version'), 'w') as fd:
+            fd.write('2')
+
+        expected = []
+
+        for dirname in self.root_dir, self.shares_dir:
+            # a plain .conflict...
+            # ...on a file
+            open(dirname + '/1a.conflict', 'w').close()
+            expected.append(dirname + '/1a.u1conflict')
+            # ...on an empty directory
+            os.mkdir(dirname + '/1b.conflict')
+            expected.append(dirname + '/1b.u1conflict')
+            # ...on a directory with content
+            os.mkdir(dirname + '/1c.conflict')
+            os.mkdir(dirname + '/1c.conflict/1c')
+            expected.append(dirname + '/1c.u1conflict/1c')
+            # ...in a readonly directory
+            os.mkdir(dirname + '/1d')
+            os.mkdir(dirname + '/1d/1d.conflict')
+            os.chmod(dirname + '/1d', 0500)
+            expected.append(dirname + '/1d/1d.u1conflict')
+            # ...in a directory that is also a .conflict
+            os.mkdir(dirname + '/1e.conflict')
+            os.mkdir(dirname + '/1e.conflict/1e.conflict')
+            expected.append(dirname + '/1e.u1conflict/1e.u1conflict')
+
+            # a numbered .conflict...
+            # ...on a file
+            open(dirname + '/2a.conflict.2', 'w').close()
+            expected.append(dirname + '/2a.u1conflict.2')
+            # ...on an empty directory
+            os.mkdir(dirname + '/2b.conflict.3')
+            expected.append(dirname + '/2b.u1conflict.3')
+            # ...on a directory with content
+            os.mkdir(dirname + '/2c.conflict.4')
+            os.mkdir(dirname + '/2c.conflict.4/2c')
+            expected.append(dirname + '/2c.u1conflict.4/2c')
+            # ...in a readonly directory
+            os.mkdir(dirname + '/2d')
+            os.mkdir(dirname + '/2d/2d.conflict.5')
+            os.chmod(dirname + '/2d', 0500)
+            expected.append(dirname + '/2d/2d.u1conflict.5')
+            # ...in a directory that is also a .conflict
+            os.mkdir(dirname + '/2e.conflict')
+            os.mkdir(dirname + '/2e.conflict/2e.conflict.6')
+            expected.append(dirname + '/2e.u1conflict/2e.u1conflict.6')
+
+            # a plain .conflict of which there already exists a .u1conflict...
+            # ...on a file
+            open(dirname + '/3a.conflict', 'w').close()
+            open(dirname + '/3a.u1conflict', 'w').close()
+            expected.append(dirname + '/3a.u1conflict')
+            expected.append(dirname + '/3a.u1conflict.1')
+            # ...on an empty directory
+            os.mkdir(dirname + '/3b.conflict')
+            os.mkdir(dirname + '/3b.u1conflict')
+            expected.append(dirname + '/3b.u1conflict')
+            expected.append(dirname + '/3b.u1conflict.1')
+            # ...on a directory with content
+            os.mkdir(dirname + '/3c.conflict')
+            os.mkdir(dirname + '/3c.conflict/3c')
+            os.mkdir(dirname + '/3c.u1conflict')
+            os.mkdir(dirname + '/3c.u1conflict/3c2')
+            expected.append(dirname + '/3c.u1conflict.1/3c')
+            expected.append(dirname + '/3c.u1conflict/3c2')
+            # ...in a readonly directory
+            os.mkdir(dirname + '/3d')
+            os.mkdir(dirname + '/3d/3d.conflict')
+            os.mkdir(dirname + '/3d/3d.u1conflict')
+            os.mkdir(dirname + '/3d/3d.u1conflict/3d')
+            os.chmod(dirname + '/3d', 0500)
+            expected.append(dirname + '/3d/3d.u1conflict/3d')
+            expected.append(dirname + '/3d/3d.u1conflict.1')
+            # ...in a directory that is also a .conflict
+            os.mkdir(dirname + '/3e.conflict')
+            os.mkdir(dirname + '/3e.conflict/3e.conflict')
+            os.mkdir(dirname + '/3e.conflict/3e.u1conflict')
+            os.mkdir(dirname + '/3e.conflict/3e.u1conflict/3e')
+            expected.append(dirname + '/3e.u1conflict/3e.u1conflict/3e')
+            expected.append(dirname + '/3e.u1conflict/3e.u1conflict.1')
+
+            # a numbered .conflict of which there already exists a .u1conflict...
+            # ...on a file
+            open(dirname + '/4a.conflict.1', 'w').close()
+            open(dirname + '/4a.u1conflict.1', 'w').close()
+            expected.append(dirname + '/4a.u1conflict.1')
+            expected.append(dirname + '/4a.u1conflict.2')
+            # ...on an empty directory
+            os.mkdir(dirname + '/4b.conflict.2')
+            os.mkdir(dirname + '/4b.u1conflict.2')
+            expected.append(dirname + '/4b.u1conflict.2')
+            expected.append(dirname + '/4b.u1conflict.3')
+            # ...on a directory with content
+            os.mkdir(dirname + '/4c.conflict.3')
+            os.mkdir(dirname + '/4c.conflict.3/4c')
+            os.mkdir(dirname + '/4c.u1conflict.3')
+            expected.append(dirname + '/4c.u1conflict.4/4c')
+            expected.append(dirname + '/4c.u1conflict.3')
+            # ...in a readonly directory
+            os.mkdir(dirname + '/4d')
+            os.mkdir(dirname + '/4d/4d.conflict.4')
+            os.mkdir(dirname + '/4d/4d.u1conflict.4')
+            os.chmod(dirname + '/4d', 0500)
+            expected.append(dirname + '/4d/4d.u1conflict.4')
+            expected.append(dirname + '/4d/4d.u1conflict.5')
+            # ...in a directory that is also a .conflict
+            os.mkdir(dirname + '/4e.conflict')
+            os.mkdir(dirname + '/4e.conflict/4e.conflict.5')
+            os.mkdir(dirname + '/4e.conflict/4e.u1conflict.5')
+            expected.append(dirname + '/4e.u1conflict/4e.u1conflict.5')
+            expected.append(dirname + '/4e.u1conflict/4e.u1conflict.6')
+
+            # a plain .partial...
+            # ...of a file
+            open(dirname + '/5a.partial', 'w').close()
+            expected.append(dirname + '/.u1partial.5a')
+            # ...of a directory
+            os.mkdir(dirname + '/5b')
+            open(dirname + '/5b/.partial', 'w').close()
+            expected.append(dirname + '/5b/.u1partial')
+            # ...of a readonly directory
+            os.mkdir(dirname + '/5c')
+            open(dirname + '/5c/.partial', 'w').close()
+            os.chmod(dirname + '/5c', 0500)
+            expected.append(dirname + '/5c/.u1partial')
+
+            # a plain .partial of which there already exists a .u1partial...
+            # ...of a file
+            open(dirname + '/6a.partial', 'w').close()
+            open(dirname + '/.u1partial.6a', 'w').close()
+            expected.append(dirname + '/.u1partial.6a')
+            expected.append(dirname + '/.u1partial.6a.1')
+            # ...of a directory
+            os.mkdir(dirname + '/6b')
+            open(dirname + '/6b/.partial', 'w').close()
+            open(dirname + '/6b/.u1partial', 'w').close()
+            expected.append(dirname + '/6b/.u1partial')
+            expected.append(dirname + '/6b/.u1partial.1')
+            # ...of a readonly directory
+            os.mkdir(dirname + '/6c')
+            open(dirname + '/6c/.partial', 'w').close()
+            open(dirname + '/6c/.u1partial', 'w').close()
+            os.chmod(dirname + '/6c', 0500)
+            expected.append(dirname + '/6c/.u1partial')
+            expected.append(dirname + '/6c/.u1partial.1')
+
+        self.main = FakeMain(self.root_dir, self.shares_dir, self.data_dir)
+
+        for path in expected:
+            self.assertTrue(os.path.exists(path), 'missing ' + path)
+
     def test_missing_version_file_with_version_non_0(self):
         """ Test the upgrade from the first shelf layout version to v3
         while the metadata sould be in v3 format
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2009-08-26 13:33:23 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2009-08-27 16:41:47 +0000
@@ -508,24 +508,48 @@
             for dirpath, dirnames, filenames in os.walk(top):
                 with allow_writes(dirpath):
                     for names in filenames, dirnames:
-                        for pos, name in enumerate(names):
-                            if name == '.partial':
-                                new_name = '.u1partial'
-                            else:
-                                new_name = re.sub(r'^(.+)\.partial$',
-                                                  r'.u1partial.\1', name)
-                                conflict_re = r'^(.+)\.conflict((?:\.\d+)?)$'
-                                new_name = re.sub(conflict_re,
-                                                  r'\1.u1conflict\2', new_name)
-                            if new_name != name:
-                                self.log.debug('renaming %r to %r',
-                                               name, new_name)
-                                os.rename(os.path.join(dirpath, name),
-                                          os.path.join(dirpath, new_name))
-                                names[pos] = new_name
+                        self._upgrade_names(dirpath, names)
         self._upgrade_metadata_3(md_version)
         self._update_metadata_version()
 
+    def _upgrade_names(self, dirpath, names):
+        """
+        Do the actual renaming for _upgrade_metadata_2
+        """
+        for pos, name in enumerate(names):
+            new_name = name
+            if re.match(r'.*\.partial$|\.u1partial(?:\..+)?', name):
+                if name == '.partial':
+                    new_name = '.u1partial'
+                else:
+                    new_name = re.sub(r'^(.+)\.partial$',
+                                      r'.u1partial.\1', name)
+                if new_name != name:
+                    while os.path.lexists(os.path.join(dirpath, new_name)):
+                        # very, very strange
+                        self.log.warning('Found a .partial and .u1partial'
+                                         ' for the same file: %s!' % new_name)
+                        new_name += '.1'
+            elif re.search(r'\.(?:u1)?conflict(?:\.\d+)?$', name):
+                new_name = re.sub(r'^(.+)\.conflict((?:\.\d+)?)$',
+                                  r'\1.u1conflict\2', name)
+                if new_name != name:
+                    while os.path.lexists(os.path.join(dirpath, new_name)):
+                        m = re.match(r'(.*\.u1conflict)((?:\.\d+)?)$', new_name)
+                        base, num = m.groups()
+                        if not num:
+                            num = '.1'
+                        else:
+                            num = '.' + str(int(num[1:])+1)
+                        new_name = base + num
+            if new_name != name:
+                old_path = os.path.join(dirpath, name)
+                new_path = os.path.join(dirpath, new_name)
+                self.log.debug('renaming %r to %r' % (old_path, new_path))
+                os.rename(old_path, new_path)
+                names[pos] = new_name
+
+
     def _upgrade_metadata_3(self, md_version):
         """
         Upgrade to version 4 (new layout!)