Merge lp:~rye/ubuntuone-client/unique-check-is-unique into lp:ubuntuone-client

[Roman Yepishev]

Use com.syncdaemon.SyncDaemon.UniqueInstance name to check for existing instance of syncdaemon.

This branch fixes the nautilus hang that happens after 30 seconds of logging in to the system. It allocates a different bus name so that libsyncdaemon clients will be notified about syncdaemon readiness only when it is really ready.

How to test:

Before and after patching and deploying updated ubuntuone-syncdaemon and dbus_interface.py
sudo sysctl vm.drop_caches=3
nautilus -q
u1sdtool --quit
nautilus
(other terminal) u1sdtool --connect
Try to do things in nautilus - depending on the amount of metadata to load nautilus can hang from several seconds to several minutes. During metadata loading phase desktop nautilus instance is also not redrawing leading to degraded experience.

With the patch applied there will be no such hang.

After you apply the changes there will be two syncdaemon instances on the bus - com.ubuntuone.SyncDaemon and com.ubuntuone.SyncDaemon.UniqueInstance serving as a reminder that in Natty the startup should be reworked.

[Rodrigo Moya (rodrigo-moya)]

This looks great to me, and will solve a lot of the problems we have at startup. But the syncdaemon guys will have the final word, so just count my approval as a 'I like it' vote :-)

review: Approve

[Guillermo Gonzalez (verterok)]

looks good

review: Approve

[Guillermo Gonzalez (verterok)]

looks good

review: Approve

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2010-09-13 18:11:02 +0000
+++ bin/ubuntuone-syncdaemon	2010-09-16 19:03:20 +0000
@@ -49,7 +49,7 @@
 def is_already_running(): 
     """ check if there is another instance registered in DBus """
     bus = dbus.SessionBus()
-    request = bus.request_name(dbus_interface.DBUS_IFACE_NAME, 
+    request = bus.request_name(dbus_interface.DBUS_IFACE_UNIQUE_NAME, 
                                dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
     return request == dbus.bus.REQUEST_NAME_REPLY_EXISTS
 

=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-09-15 20:35:11 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-09-16 19:03:20 +0000
@@ -39,7 +39,8 @@
 # pylint: disable-msg=C0103
 
 DBUS_IFACE_NAME = 'com.ubuntuone.SyncDaemon'
-DBUS_IFACE_SYNC_NAME = 'com.ubuntuone.SyncDaemon.SyncDaemon'
+DBUS_IFACE_UNIQUE_NAME = DBUS_IFACE_NAME + '.UniqueInstance'
+DBUS_IFACE_SYNC_NAME = DBUS_IFACE_NAME + '.SyncDaemon'
 DBUS_IFACE_STATUS_NAME = DBUS_IFACE_NAME+'.Status'
 DBUS_IFACE_EVENTS_NAME = DBUS_IFACE_NAME+'.Events'
 DBUS_IFACE_FS_NAME = DBUS_IFACE_NAME+'.FileSystem'