Merge lp:~verterok/ubuntuone-client/bad-share-path into lp:ubuntuone-client

[Guillermo Gonzalez]

update FSM metadata for the new layout.

[Guillermo Gonzalez (verterok)]

Fix the FSM metadata for the new layout.
Basically this updates the path of the shares in the fsm metadata as we store the full path for the share root (shares inclues the users root)

[Rick McBride (rmcbride)]

This looks good. I actually built packages from it and ran against the live server and it works nicely.

review: Approve

[John Lenton (chipaca)]

review: Approve

[dobey (dobey)]

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for intltool >= 0.30...
(B testing intltoolize... found 0.40.6
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --enable-maintainer-mode --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking fo...

[lp:~verterok/ubuntuone-client/bad-share-path]

192. By Guillermo Gonzalez on 2009-08-27

update tests

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2009-08-14 18:37:28 +0000
+++ tests/syncdaemon/test_fsm.py	2009-08-27 19:57:42 +0000
@@ -230,6 +230,21 @@
         open(path, "w").close()
         mdid = self.fsm.create(path, "share")
         self.fsm.set_node_id(path, "uuid")
+        # create a path with the old layout
+        other_share = self.create_share('share1', 'share1_name',
+                                            self.fsm, self.shares_dir)
+        share_mdid = self.fsm.create(other_share.path, "share1")
+        self.fsm.set_node_id(other_share.path, "uuid1")
+        os.makedirs(os.path.join(self.root_dir, 'Ubuntu One'))
+        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+                            'Shared With Me')
+        old_path = os.path.join(old_shares_path, 'share1_name')
+        os.symlink(self.shares_dir, old_shares_path)
+
+        # put the old path in the mdobj
+        share_md = self.fsm.fs[share_mdid]
+        share_md['path'] = old_path
+        self.fsm.fs[share_mdid] = share_md
 
         # break the node on purpose
         real_mdobj = self.fsm.fs[mdid]
@@ -246,13 +261,16 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.stat, os.stat(path))
         self.assertEqual(newmdobj.local_hash, "")
         self.assertEqual(newmdobj.server_hash, "")
         self.assertTrue(isinstance(newmdobj.path, str))
+        self.assertTrue(other_share.path in newfsm._idx_path)
+        self.assertFalse(old_path in self.fsm._idx_path)
+        self.assertFalse(old_path in newfsm._idx_path)
 
     def test_old_metadata_1(self):
         '''Faking an old metadata situation, in v1.'''
@@ -264,6 +282,22 @@
         mdid2 = self.fsm.create(path2, "share")
         self.fsm.set_node_id(path2, "uuid2")
 
+        # create a path with the old layout
+        other_share = self.create_share('share1', 'share1_name',
+                                            self.fsm, self.shares_dir)
+        share_mdid = self.fsm.create(other_share.path, "share1")
+        self.fsm.set_node_id(other_share.path, "uuid1")
+        os.makedirs(os.path.join(self.root_dir, 'Ubuntu One'))
+        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+                            'Shared With Me')
+        old_path = os.path.join(old_shares_path, 'share1_name')
+        os.symlink(self.shares_dir, old_shares_path)
+
+        # put the old path in the mdobj
+        share_md = self.fsm.fs[share_mdid]
+        share_md['path'] = old_path
+        self.fsm.fs[share_mdid] = share_md
+
         # break the node on purpose, with unicode valid and not
         real_mdobj = self.fsm.fs[mdid1]
         real_mdobj["path"] = unicode(real_mdobj["path"])
@@ -282,14 +316,16 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path1)
         self.assertEqual(newmdobj.mdid, mdid1)
         self.assertEqual(newmdobj.local_hash, "")
         self.assertEqual(newmdobj.server_hash, "")
         self.assertTrue(isinstance(newmdobj.path, str))
         # pylint: disable-msg=W0212
-        self.assertEqual(1, len(newfsm._idx_node_id))
+        self.assertEqual(2, len(newfsm._idx_node_id))
+        self.assertTrue(other_share.path in newfsm._idx_path)
+        self.assertFalse(old_path in newfsm._idx_path)
 
     def test_old_metadata_2(self):
         '''Faking an old metadata situation, in v2.'''
@@ -297,6 +333,21 @@
         path = os.path.join(self.share.path, 'path')
         mdid = self.fsm.create(path, "share")
         self.fsm.set_node_id(path, "uuid")
+        # create a path with the old layout
+        other_share = self.create_share('share1', 'share1_name',
+                                            self.fsm, self.shares_dir)
+        share_mdid = self.fsm.create(other_share.path, "share1")
+        self.fsm.set_node_id(other_share.path, "uuid1")
+        os.makedirs(os.path.join(self.root_dir, 'Ubuntu One'))
+        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+                            'Shared With Me')
+        old_path = os.path.join(old_shares_path, 'share1_name')
+        os.symlink(self.shares_dir, old_shares_path)
+
+        # put the old path in the mdobj
+        share_md = self.fsm.fs[share_mdid]
+        share_md['path'] = old_path
+        self.fsm.fs[share_mdid] = share_md
 
         # break the node on purpose, with hashes in None
         real_mdobj = self.fsm.fs[mdid]
@@ -312,14 +363,67 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.local_hash, "")
         self.assertEqual(newmdobj.server_hash, "")
         self.assertTrue(isinstance(newmdobj.path, str))
         # pylint: disable-msg=W0212
-        self.assertEqual(1, len(newfsm._idx_node_id))
+        self.assertEqual(2, len(newfsm._idx_node_id))
+        self.assertTrue(other_share.path in newfsm._idx_path)
+        self.assertFalse(old_path in newfsm._idx_path)
+
+    def test_old_metadata_3(self):
+        '''Faking an old metadata situation, in v3.'''
+        # create a path with the old layout and metadata
+        # the root
+        root_mdid = self.fsm.create(self.root_dir, "")
+        self.fsm.set_node_id(self.root_dir, "uuid")
+        # a share
+        other_share = self.create_share('share1', 'share1_name',
+                                            self.fsm, self.shares_dir)
+        share_mdid = self.fsm.create(other_share.path, "share1")
+        self.fsm.set_node_id(other_share.path, "uuid1")
+        os.makedirs(os.path.join(self.root_dir, 'Ubuntu One'))
+        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+                            'Shared With Me')
+        old_path = os.path.join(old_shares_path, 'share1_name')
+        os.symlink(self.shares_dir, old_shares_path)
+        old_root_path = os.path.join(os.path.dirname(self.root_dir),
+                                     'Ubuntu One', 'My Files')
+
+        # put the old path in the mdobjs
+        share_md = self.fsm.fs[share_mdid]
+        share_md['path'] = old_path
+        self.fsm.fs[share_mdid] = share_md
+        root_md = self.fsm.fs[root_mdid]
+        root_md['path'] = old_root_path
+        self.fsm.fs[root_mdid] = root_md
+
+        # put the version file in 1
+        version_file = os.path.join(self.fsmdir, "metadata_version")
+        with open(version_file, "w") as fh:
+            fh.write("3")
+
+        # start up again, and check
+        newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
+        md_version = open(version_file).read()
+        self.assertEqual(md_version, "4")
+        newmdobj = newfsm.get_by_path(other_share.path)
+        self.assertEquals(newmdobj.mdid, share_md['mdid'])
+        self.assertNotEquals(newmdobj.path, share_md['path'])
+
+        root_dir = os.path.dirname(old_root_path)
+        rootmdobj = newfsm.get_by_path(root_dir)
+        self.assertEquals(rootmdobj.mdid, root_md['mdid'])
+        self.assertEquals(rootmdobj.path, root_dir)
+        # pylint: disable-msg=W0212
+        self.assertEqual(2, len(newfsm._idx_node_id))
+        self.assertTrue(other_share.path in newfsm._idx_path)
+        self.assertFalse(old_path in newfsm._idx_path)
+        self.assertTrue(root_dir in newfsm._idx_path)
+        self.assertFalse(old_root_path in newfsm._idx_path)
 
     def test_fresh_metadata_broken_pickle_without_backup(self):
         '''Initing with latest metadata, but with broked value in the shelf'''
@@ -347,7 +451,7 @@
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         version_file = os.path.join(self.fsmdir, "metadata_version")
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         self.assertTrue(newfsm.get_by_mdid(mdid) is not None)
         self.assertRaises(KeyError, newfsm.get_by_mdid, mdid1)
         self.assertRaises(KeyError, newfsm.get_by_mdid, mdid2)
@@ -382,7 +486,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         self.assertTrue(newfsm.get_by_mdid(mdid) is not None)
         self.assertRaises(KeyError, newfsm.get_by_mdid, mdid1)
         self.assertRaises(KeyError, newfsm.get_by_mdid, mdid2)
@@ -421,7 +525,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.local_hash, "")
@@ -465,7 +569,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.local_hash, "")
@@ -505,7 +609,7 @@
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         version_file = os.path.join(self.fsmdir, "metadata_version")
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         self.assertTrue(newfsm.get_by_mdid(mdid) is not None)
         # pylint: disable-msg=W0212
         self.assertEqual(1, len(newfsm._idx_node_id))
@@ -547,7 +651,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         self.assertTrue(newfsm.get_by_mdid(mdid) is not None)
         # pylint: disable-msg=W0212
         self.assertEqual(1, len(newfsm._idx_node_id))
@@ -593,7 +697,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.local_hash, "")
@@ -645,7 +749,7 @@
         # start up again, and check
         newfsm = FileSystemManager(self.fsmdir, self.fsm.vm)
         md_version = open(version_file).read()
-        self.assertEqual(md_version, "3")
+        self.assertEqual(md_version, "4")
         newmdobj = newfsm.get_by_path(path)
         self.assertEqual(newmdobj.mdid, mdid)
         self.assertEqual(newmdobj.local_hash, "")

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2009-08-21 20:07:08 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2009-08-27 19:57:42 +0000
@@ -31,7 +31,7 @@
 from ubuntuone.syncdaemon import file_shelf
 import uuid
 
-METADATA_VERSION = "3"
+METADATA_VERSION = "4"
 
 #
 # File System Manager  (FSM)
@@ -241,6 +241,18 @@
         # filter all False values
         return itertools.ifilter(None, safe_iteritems)
 
+    def _fix_path_for_new_layout(self, mdobj):
+        """fix the mdobj path for the new layout, only for shares root"""
+        base_path, name = os.path.split(mdobj['path'])
+        if base_path.startswith('/') and \
+           base_path.endswith('Ubuntu One/Shared With Me'):
+            realpath = os.path.realpath(mdobj['path'])
+            mdobj['path'] = realpath
+        if base_path.startswith('/') and \
+            base_path.endswith('Ubuntu One') and name == 'My Files':
+            mdobj['path'] = base_path
+
+
     def _load_metadata_None(self, old_version):
         '''Loads metadata from when it wasn't even versioned.'''
         logger("loading metadata from old version %r", old_version)
@@ -254,8 +266,10 @@
                 del self.fs[mdid]
                 continue
 
+            # fix the path
+            self._fix_path_for_new_layout(mdobj)
+            abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
             # of course, load the metadata
-            abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
             self._idx_path[abspath] = mdid
             if mdobj["node_id"] is not None:
                 self._idx_node_id[(mdobj["share_id"], mdobj["node_id"])] = mdid
@@ -295,6 +309,8 @@
             if mdobj["server_hash"] is None:
                 mdobj["server_hash"] = ""
 
+            # fix the path
+            self._fix_path_for_new_layout(mdobj)
             # write back the object
             self.fs[mdid] = mdobj
 
@@ -319,9 +335,30 @@
             if mdobj["server_hash"] is None:
                 mdobj["server_hash"] = ""
 
-            # write back the object
-            self.fs[mdid] = mdobj
-
+            # fix the path
+            self._fix_path_for_new_layout(mdobj)
+            # write back the object
+            self.fs[mdid] = mdobj
+
+            # and of course, load the metadata
+            abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
+            self._idx_path[abspath] = mdid
+            if mdobj["node_id"] is not None:
+                self._idx_node_id[(mdobj["share_id"], mdobj["node_id"])] = mdid
+
+        # set new version
+        with open(self._version_file, "w") as fh:
+            fh.write(METADATA_VERSION)
+
+    def _load_metadata_3(self, old_version):
+        '''Loads metadata from version 3.'''
+        logger("loading metadata from old version %r", old_version)
+
+        for mdid, mdobj in self._safe_fs_iteritems():
+            # fix the path
+            self._fix_path_for_new_layout(mdobj)
+            # write back the object
+            self.fs[mdid] = mdobj
             # and of course, load the metadata
             abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
             self._idx_path[abspath] = mdid