Merge lp:~cmiller/ubuntu/lucid/desktopcouch/lp726597 into lp:ubuntu/lucid-proposed/desktopcouch

[Chad Miller]

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-19 20:18:04 +0000
+++ debian/changelog	2011-03-10 18:17:44 +0000
@@ -1,3 +1,10 @@
+desktopcouch (0.6.4-0ubuntu3.2) lucid-proposed; urgency=low
+
+  * Add debian/patches/lp_726597.patch
+    - Avoid race for startup of couchdb (LP: #726597)
+
+ -- Chad MILLER <[e-mail]>  Thu, 03 Mar 2011 11:06:01 -0500
+
 desktopcouch (0.6.4-0ubuntu3.1) lucid-proposed; urgency=low
 
   * Add gnome-keyring to depends of python-desktopcouch (LP: #565376)

=== added file 'debian/patches/lp_726597.patch'
--- debian/patches/lp_726597.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp_726597.patch	2011-03-10 18:17:44 +0000
@@ -0,0 +1,66 @@
+Description: Avoid a race to find and start a new couchdb.
+Origin: Upstream
+Author: Roman Yepishev <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/726597
+Forwarded: not-needed
+
+=== modified file 'desktopcouch/__init__.py'
+--- old/desktopcouch/__init__.py	2010-03-10 22:18:24 +0000
++++ new/desktopcouch/__init__.py	2011-02-23 22:58:49 +0000
+@@ -20,7 +20,8 @@
+ from desktopcouch.start_local_couchdb import process_is_couchdb, read_pidfile
+ import dbus
+ import logging
+-
++import time
++from fcntl import flock, LOCK_EX, LOCK_NB
+ 
+ def find_pid(start_if_not_running=True, ctx=local_files.DEFAULT_CONTEXT):
+     """Find the current OS process ID of the running couchdb.  API users
+@@ -30,11 +31,26 @@
+     if not process_is_couchdb(pid):
+         if start_if_not_running:
+             # start CouchDB by running the startup script
+-            logging.info("Desktop CouchDB is not running; starting it.")
+-            from desktopcouch import start_local_couchdb
+-            pid = start_local_couchdb.start_couchdb(ctx=ctx)
+-            # now load the design documents, because it's started
+-            start_local_couchdb.update_design_documents()
++            # we check the lock, if some process holds the lock then we will
++            # merely wait for pifile to become meaningful
++            try:
++                ctx.lock_fd = open(ctx.file_lock, "w")
++                flock(ctx.lock_fd, LOCK_EX | LOCK_NB)
++            except IOError:
++                logging.info("Another Desktop CouchDB is running. "
++                             "Waiting for PID.")
++                pid = None
++                for timeout in (0.4, 0.1, 0.1, 0.2, 0.5, 1, 3, 5):
++                    pid = read_pidfile(ctx=ctx)
++                    if pid is not None and process_is_couchdb(pid):
++                        break
++                    time.sleep(timeout)
++            else:
++                logging.info("Desktop CouchDB is not running; starting it.")
++                from desktopcouch import start_local_couchdb
++                pid = start_local_couchdb.start_couchdb(ctx=ctx)
++                # now load the design documents, because it's started
++                start_local_couchdb.update_design_documents()
+ 
+             if not process_is_couchdb(pid):
+                 logging.error("CouchDB process did not start up")
+
+=== modified file 'desktopcouch/local_files.py'
+--- old/desktopcouch/local_files.py	2010-04-13 00:33:23 +0000
++++ new/desktopcouch/local_files.py	2011-02-23 22:58:49 +0000
+@@ -228,6 +228,9 @@
+         self.file_stdout = os.path.join(run_dir, "desktop-couchdb.stdout")
+         self.file_stderr = os.path.join(run_dir, "desktop-couchdb.stderr")
+ 
++        self.file_lock = os.path.join(run_dir, "desktop-couchdb.lock")
++        self.lock_fd = None
++
+         # You will need to add -b or -k on the end of this
+         self.couch_exec_command = [COUCH_EXE, self.couch_chain_ini_files(), 
+                 '-p', self.file_pid, 
+