Merge lp:~james-w/udd/sqlite-timeout into lp:udd

[James Westby]

Hi,

This has the storm code use the sqlite timeout that was in use when
using sqlite3. Hopefully this will avoid most of the db contention errors
we have been seeing.

Thanks,

James

[Max Bowsher (maxb)]

Makes sense, doesn't introduce any new test failures. Most definitely required, given the errors happening on jubany.

review: Approve

=== modified file 'udd/icommon.py'
--- udd/icommon.py	2012-04-04 17:32:38 +0000
+++ udd/icommon.py	2012-04-10 01:20:26 +0000
@@ -42,7 +42,6 @@
 # below. Some way to share the config is needed -- vila 2011-12-07
 conf = iconfig.ImporterStack()
 
-sqlite_timeout = 30
 running_sentinel = "Apparently the supervisor died\n"
 no_lock_returncode = 139
 

=== modified file 'udd/idb.py'
--- udd/idb.py	2012-03-23 17:14:07 +0000
+++ udd/idb.py	2012-04-10 01:20:26 +0000
@@ -1,6 +1,9 @@
 from storm.locals import create_database, Store
 
 
+sqlite_timeout = 30
+
+
 def get_sqlite_connection_string(config, db_name):
     if db_name == 'main':
         path = config.get('pi.sqlite_file')
@@ -10,7 +13,7 @@
         path = config.get('pi.sqlite_history_file')
     else:
         raise AssertionError("Unknown db_name: %s" % db_name)
-    return 'sqlite:%s' % path
+    return 'sqlite:%s?timeout=%d' % (path, sqlite_timeout)
 
 
 def get_postgres_connection_string(config, db_name):

=== modified file 'udd/tests/test_idb.py'
--- udd/tests/test_idb.py	2012-03-23 17:14:07 +0000
+++ udd/tests/test_idb.py	2012-04-10 01:20:26 +0000
@@ -12,7 +12,7 @@
                 iconfig.PkgimportStore(self.get_transport()),
                             'pi.sqlite_file=bar\n')
         stack = iconfig.ImporterStack()
-        self.assertEquals('sqlite:bar',
+        self.assertEquals('sqlite:bar?timeout=%d' % idb.sqlite_timeout,
                 idb.get_sqlite_connection_string(stack, 'main'))
 
     def test_get_sqlite_connection_string_package(self):
@@ -20,7 +20,7 @@
                 iconfig.PkgimportStore(self.get_transport()),
                             'pi.sqlite_package_file=baz\n')
         stack = iconfig.ImporterStack()
-        self.assertEquals('sqlite:baz',
+        self.assertEquals('sqlite:baz?timeout=%d' % idb.sqlite_timeout,
                 idb.get_sqlite_connection_string(stack, 'package'))
 
     def test_get_sqlite_connection_string_history(self):
@@ -28,7 +28,7 @@
                 iconfig.PkgimportStore(self.get_transport()),
                             'pi.sqlite_history_file=zap\n')
         stack = iconfig.ImporterStack()
-        self.assertEquals('sqlite:zap',
+        self.assertEquals('sqlite:zap?timeout=%d' % idb.sqlite_timeout,
                 idb.get_sqlite_connection_string(stack, 'history'))
 
 
@@ -57,7 +57,7 @@
                             'pi.db_type=sqlite\npi.sqlite_file=bar\n')
         stack = iconfig.ImporterStack()
         conn_str, db_type = idb.get_connection_string(stack, 'main')
-        self.assertEquals('sqlite:bar', conn_str)
+        self.assertEquals('sqlite:bar?timeout=%d' % idb.sqlite_timeout, conn_str)
         self.assertEquals('sqlite', db_type)
 
     def test_get_connection_string_postgres(self):