1
=== modified file 'debian/changelog'
2
--- debian/changelog	2010-09-19 20:18:04 +0000
3
+++ debian/changelog	2011-03-10 18:17:44 +0000
4
@@ -1,3 +1,10 @@
5
1
desktopcouch (0.6.4-0ubuntu3.2) lucid-proposed; urgency=low
6
2
7
3
  * Add debian/patches/lp_726597.patch
8
4
    - Avoid race for startup of couchdb (LP: #726597)
9
5
10
6
 -- Chad MILLER <chad.miller@canonical.com>  Thu, 03 Mar 2011 11:06:01 -0500
11
7
12
1
desktopcouch (0.6.4-0ubuntu3.1) lucid-proposed; urgency=low
8
desktopcouch (0.6.4-0ubuntu3.1) lucid-proposed; urgency=low
13
2
9
14
3
  * Add gnome-keyring to depends of python-desktopcouch (LP: #565376)
10
  * Add gnome-keyring to depends of python-desktopcouch (LP: #565376)
15
4
11
16
=== added file 'debian/patches/lp_726597.patch'
17
--- debian/patches/lp_726597.patch	1970-01-01 00:00:00 +0000
18
+++ debian/patches/lp_726597.patch	2011-03-10 18:17:44 +0000
19
@@ -0,0 +1,66 @@
20
1
Description: Avoid a race to find and start a new couchdb.
21
2
Origin: Upstream
22
3
Author: Roman Yepishev <roman.yepishev@canonical.com>
23
4
Bug-Ubuntu: https://bugs.launchpad.net/726597
24
5
Forwarded: not-needed
25
6
26
7
=== modified file 'desktopcouch/__init__.py'
27
8
--- old/desktopcouch/__init__.py	2010-03-10 22:18:24 +0000
28
9
+++ new/desktopcouch/__init__.py	2011-02-23 22:58:49 +0000
29
10
@@ -20,7 +20,8 @@
30
11
 from desktopcouch.start_local_couchdb import process_is_couchdb, read_pidfile
31
12
 import dbus
32
13
 import logging
33
14
-
34
15
+import time
35
16
+from fcntl import flock, LOCK_EX, LOCK_NB
36
17
 
37
18
 def find_pid(start_if_not_running=True, ctx=local_files.DEFAULT_CONTEXT):
38
19
     """Find the current OS process ID of the running couchdb.  API users
39
20
@@ -30,11 +31,26 @@
40
21
     if not process_is_couchdb(pid):
41
22
         if start_if_not_running:
42
23
             # start CouchDB by running the startup script
43
24
-            logging.info("Desktop CouchDB is not running; starting it.")
44
25
-            from desktopcouch import start_local_couchdb
45
26
-            pid = start_local_couchdb.start_couchdb(ctx=ctx)
46
27
-            # now load the design documents, because it's started
47
28
-            start_local_couchdb.update_design_documents()
48
29
+            # we check the lock, if some process holds the lock then we will
49
30
+            # merely wait for pifile to become meaningful
50
31
+            try:
51
32
+                ctx.lock_fd = open(ctx.file_lock, "w")
52
33
+                flock(ctx.lock_fd, LOCK_EX | LOCK_NB)
53
34
+            except IOError:
54
35
+                logging.info("Another Desktop CouchDB is running. "
55
36
+                             "Waiting for PID.")
56
37
+                pid = None
57
38
+                for timeout in (0.4, 0.1, 0.1, 0.2, 0.5, 1, 3, 5):
58
39
+                    pid = read_pidfile(ctx=ctx)
59
40
+                    if pid is not None and process_is_couchdb(pid):
60
41
+                        break
61
42
+                    time.sleep(timeout)
62
43
+            else:
63
44
+                logging.info("Desktop CouchDB is not running; starting it.")
64
45
+                from desktopcouch import start_local_couchdb
65
46
+                pid = start_local_couchdb.start_couchdb(ctx=ctx)
66
47
+                # now load the design documents, because it's started
67
48
+                start_local_couchdb.update_design_documents()
68
49
 
69
50
             if not process_is_couchdb(pid):
70
51
                 logging.error("CouchDB process did not start up")
71
52
72
53
=== modified file 'desktopcouch/local_files.py'
73
54
--- old/desktopcouch/local_files.py	2010-04-13 00:33:23 +0000
74
55
+++ new/desktopcouch/local_files.py	2011-02-23 22:58:49 +0000
75
56
@@ -228,6 +228,9 @@
76
57
         self.file_stdout = os.path.join(run_dir, "desktop-couchdb.stdout")
77
58
         self.file_stderr = os.path.join(run_dir, "desktop-couchdb.stderr")
78
59
 
79
60
+        self.file_lock = os.path.join(run_dir, "desktop-couchdb.lock")
80
61
+        self.lock_fd = None
81
62
+
82
63
         # You will need to add -b or -k on the end of this
83
64
         self.couch_exec_command = [COUCH_EXE, self.couch_chain_ini_files(), 
84
65
                 '-p', self.file_pid, 
85
66
Reviewer	Date Requested	Status
Ubuntu Stable Release Updates Team	2011-03-11	Pending
Ubuntu Development Team	2011-03-10	Pending
Review via email: mp+52897@code.launchpad.net