desktopcouch

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

cpu-usage-replication
Merge into trunk

Proposed by Chad Miller on 2011-07-19

Status:

Merged

Approved by:

dobey on 2011-07-21

Approved revision:

282

Merged at revision:

279

Proposed branch:

lp://staging/~cmiller/desktopcouch/cpu-usage-replication

Merge into:

lp://staging/desktopcouch

Diff against target:

85 lines (+21/-1)

4 files modified

desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+3/-0)
desktopcouch/application/plugins/ubuntuone_pairing.py (+13/-1)
desktopcouch/application/service.py (+1/-0)
desktopcouch/application/tests/test_service.py (+4/-0)

To merge this branch:

bzr merge lp://staging/~cmiller/desktopcouch/cpu-usage-replication

High

Confirmed

Link a bug report

Reviewer	Review Type	Date Requested	Status
dobey (community)			Approve on 2011-07-21
Roman Yepishev (community)	fieldtest		Approve on 2011-07-21
Eric Casteleijn (community)		2011-07-19	Approve on 2011-07-19
Review via email: mp+68462@code.staging.launchpad.net

Commit message

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.