Merge lp:~cmiller/desktopcouch/cpu-usage-replication into lp:desktopcouch

[Chad Miller]

Slow down the idle-run function that checks for whether all the blocking semaphores are completed. gobject may call this every chance it gets, which pegs the CPU.

Catch the signal from the service that indicates no response is ever coming, CredentialsNotFound. Don't wait for timeout. Also, in cases where there is no response from the ubuntu-sso client, continue with execution. A dbus method call is waiting on us to complete, probably. desktopcouch can operate without ubuntuone support, so we shouldn't deny it from running altogether.

[Eric Casteleijn (thisfred)]

Looks good.

review: Approve

[Roman Yepishev (rye)]

During my tests it takes 20 seconds to start replying to the dbus getPort() even when all the databases are already in disk cache. Could you please check whether this is happening on your installation too?

review: Needs Information (fieldtest)

[Roman Yepishev (rye)]

Looks awesome!

review: Approve (fieldtest)

[dobey (dobey)]

56 +
57 + gobject.timeout_add(TIMEOUT_SEC*1000, blocking_semaphores.discard,
58 + PLUGIN_NAME)

You should drop the *1000 here and use timeout_add_seconds() instead. Using add_seconds instead, results in timeouts getting aligned, so that number of wakeups is reduced.

review: Needs Fixing

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py'
--- desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-04-15 21:43:34 +0000
+++ desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-07-21 14:41:34 +0000
@@ -169,6 +169,9 @@
 
         iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
         bus.add_signal_receiver(handler_function=ANY,
+                                signal_name='CredentialsNotFound',
+                                dbus_interface=iface)
+        bus.add_signal_receiver(handler_function=ANY,
                                 signal_name='CredentialsFound',
                                 dbus_interface=iface)
 

=== modified file 'desktopcouch/application/plugins/ubuntuone_pairing.py'
--- desktopcouch/application/plugins/ubuntuone_pairing.py	2011-04-14 02:55:00 +0000
+++ desktopcouch/application/plugins/ubuntuone_pairing.py	2011-07-21 14:41:34 +0000
@@ -24,6 +24,7 @@
 from desktopcouch.application.server import DesktopDatabase
 from ubuntuone.clientdefs import APP_NAME
 
+TIMEOUT_SEC = 20
 PLUGIN_NAME = __name__
 U1_PAIR_RECORD = "ubuntu_one_pair_record"
 MAP_JS = """function(doc) {
@@ -33,7 +34,6 @@
     }
 """
 
-
 def pair_with_ubuntuone(couchdb_port, blocking_semaphores,
                         management_db=None,
                         db_class=DesktopDatabase,
@@ -95,8 +95,17 @@
         receiver = lambda *args: \
                 got_new_credentials(couchdb_port, blocking_semaphores,
                                                      *args)
+        def abort_getting_credentials(*args):
+            """Log and remove our semaphore."""
+            logging.warn("Credentials not found for ubuntuone.")
+            blocking_semaphores.discard(PLUGIN_NAME)
 
         iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
+
+        bus.add_signal_receiver(handler_function=abort_getting_credentials,
+                                signal_name='CredentialsNotFound',
+                                dbus_interface=iface)
+
         bus.add_signal_receiver(handler_function=receiver,
                                 signal_name='CredentialsFound',
                                 dbus_interface=iface)
@@ -125,3 +134,6 @@
         blocking_semaphores.add(PLUGIN_NAME)
 
         gobject.idle_add(listen_to_dbus, couchdb_port, blocking_semaphores)
+
+        gobject.timeout_add_seconds(TIMEOUT_SEC, blocking_semaphores.discard,
+                PLUGIN_NAME)

=== modified file 'desktopcouch/application/service.py'
--- desktopcouch/application/service.py	2011-07-20 20:35:43 +0000
+++ desktopcouch/application/service.py	2011-07-21 14:41:34 +0000
@@ -122,6 +122,7 @@
                 func, *args, **kwargs):
             """Run a function if no semaphores exist, else try later."""
             if blocking_semaphores:
+                self._sleep(0.2)  # Never peg the CPU
                 return True  # Make idle call try us again.
             else:
                 func(*args, **kwargs)

=== modified file 'desktopcouch/application/tests/test_service.py'
--- desktopcouch/application/tests/test_service.py	2011-04-25 16:46:35 +0000
+++ desktopcouch/application/tests/test_service.py	2011-07-21 14:41:34 +0000
@@ -82,6 +82,10 @@
         self._mainloop.stop             # pylint: disable=W0104
         self.mocker.result(ANY)
 
+        semaphores.discard              # pylint: disable=W0104
+        self.mocker.result("disc")
+        self._gobject.timeout_add_seconds(ANY, "disc", ANY)
+
         self._gobject.idle_add(ANY, self._port_result, semaphores)
         self._gobject.idle_add(ANY, semaphores, self._advertiser, ANY,
                                self._ctx)