bitbake: serv/db: Fix looping upon database locked issues
If the database is locked we will get an immediate error indicating so, there is no retry timeout. The looping code is therefore useless, the loop count is near instantly exceeded. Using a time based retry means we can wait a sensible time, then gracefully exit. (Bitbake rev: 9f9e6d87007ea87e62495705464f4232c996a165) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b306d7d9a4
commit
3e5abff7da
|
@ -2,6 +2,7 @@ import logging
|
|||
import os.path
|
||||
import errno
|
||||
import prserv
|
||||
import time
|
||||
|
||||
try:
|
||||
import sqlite3
|
||||
|
@ -32,13 +33,13 @@ class PRTable(object):
|
|||
|
||||
def _execute(self, *query):
|
||||
"""Execute a query, waiting to acquire a lock if necessary"""
|
||||
count = 0
|
||||
start = time.time()
|
||||
end = start + 20
|
||||
while True:
|
||||
try:
|
||||
return self.conn.execute(*query)
|
||||
except sqlite3.OperationalError as exc:
|
||||
if 'is locked' in str(exc) and count < 500:
|
||||
count = count + 1
|
||||
if 'is locked' in str(exc) and end > time.time():
|
||||
continue
|
||||
raise exc
|
||||
|
||||
|
|
Loading…
Reference in New Issue