Merge lp:~javier.collado/utah/bug1095669 into lp:utah

[Javier Collado]

As explained in the bug comments, this is not a solution, but a workaround to
have a greater timeout than sqlite3's default and check if the issue goes away.

[Max Brustkern (nuclearbob)]

This looks like a good potential solution, and much simpler than what I was envisioning. I think it's worth a try.

=== modified file 'utah/config.py'
--- utah/config.py	2012-12-17 19:55:15 +0000
+++ utah/config.py	2013-01-22 10:40:25 +0000
@@ -137,6 +137,9 @@
     wwwdir=os.path.join('/', 'var', 'www', 'utah'),
     # Default VM XML file
     xml=os.path.join('/', 'etc', 'utah', 'default-vm.xml'),
+    # sqlite database connection timeout
+    # a value higher than the default is used to avoid db locking problems
+    sqlite3_db_connection_timeout=30,
 )
 
 # These depend on the local user/path, and need to be filtered out

=== modified file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2012-12-12 20:25:24 +0000
+++ utah/provisioning/inventory/sqlite.py	2013-01-22 10:40:25 +0000
@@ -18,6 +18,7 @@
 import sqlite3
 import os
 from utah.provisioning.inventory.inventory import Inventory
+from utah import config
 
 
 class SQLiteInventory(Inventory):
@@ -29,7 +30,8 @@
         db = os.path.expanduser(db)
         super(SQLiteInventory, self).__init__(*args, uniqueid=db, **kw)
         self.db = db
-        self.connection = sqlite3.connect(self.db)
+        self.connection = sqlite3.connect(self.db,
+                                          config.sqlite3_db_connection_timeout)
         self.connection.isolation_level = None
         self.connection.row_factory = sqlite3.Row