desktopcouch

Merge lp://qastaging/~cmiller/desktopcouch/mother-forking-threads into lp://qastaging/desktopcouch

mother-forking-threads
Merge into trunk

Proposed by Chad Miller on 2010-04-05

Status:

Merged

Approved by:

Stuart Colville on 2010-04-08

Approved revision:

144

Merged at revision:

not available

Proposed branch:

lp://qastaging/~cmiller/desktopcouch/mother-forking-threads

Merge into:

lp://qastaging/desktopcouch

Diff against target:

243 lines (+88/-62)

4 files modified

bin/desktopcouch-pair (+2/-0)
bin/desktopcouch-service (+83/-45)
desktopcouch/pair/couchdb_pairing/dbus_io.py (+0/-2)
desktopcouch/replication.py (+3/-15)

To merge this branch:

bzr merge lp://qastaging/~cmiller/desktopcouch/mother-forking-threads

Related bugs:

Bug #524566: desktopcouch-service crashed with SIGSEGV	Critical	Fix Released
Bug #530605: gvfs-mount doesn't always work. gvfsd-smb starts using 100% cpu.	Critical	Invalid

Link a bug report

Reviewer	Date Requested	Status
Rick McBride (community)		Approve on 2010-04-07
Tim Cole (community)	2010-04-05	Approve on 2010-04-06
Review via email: mp+22838@code.qastaging.launchpad.net

Commit message

Split desktopcouch-service threads into to discrete processes, since they do not depend on each other, and because multithreading breaks with recent changes to libraries. (LP: #524566, #530605)

For places we use DBus function calls, pull the DBus glib mainloop setting close to the place we assign the mainloop to the twisted reactor.

Revision history for this message

Tim Cole (tcole) wrote on 2010-04-06:

Cool, +1 on processes versus threads.

review: Approve

Revision history for this message

Tim Cole (tcole) wrote on 2010-04-06:

(It may also be worth thinking about having the parent restart the child if it dies.)

Revision history for this message

Rick McBride (rmcbride) wrote on 2010-04-07:

I like it. I did see mention that Joshua Hoover was going to review this (after I started my review) so I'll defer changing the merge request status pending his review.

review: Approve

Revision history for this message

Joshua Hoover (joshuahoover) wrote on 2010-04-07:

I tested this yesterday the best I could based on the bug comments. As long as Tim and Rick are cool with it then we should get it released ASAP.