[bitbake-devel] [PATCH 1/1] bitbake/persist_data: Reconnect when DB is locked

[McClintock Matthew-B29882]

This needs to be in edison-next. It cherry-pick's cleanly as an added
plus (doing more testing now). Seems like it's already in denzil-next

-M

On Sun, Jan 15, 2012 at 10:07 PM, Lianhao Lu <lianhao.lu at intel.com> wrote:
> [YOCTO #1761]
> Reconnect to the backend Sqlite DB in 'database is locked' exception so
> the timeout can be leveraged in each time retry.
>
> Signed-off-by: Lianhao Lu <lianhao.lu at intel.com>
> ---
>  bitbake/lib/bb/persist_data.py |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
> index 17620ef..c4ea23b 100644
> --- a/bitbake/lib/bb/persist_data.py
> +++ b/bitbake/lib/bb/persist_data.py
> @@ -47,9 +47,10 @@ if hasattr(sqlite3, 'enable_shared_cache'):
>  @total_ordering
>  class SQLTable(collections.MutableMapping):
>     """Object representing a table/domain in the database"""
> -    def __init__(self, cursor, table):
> -        self.cursor = cursor
> +    def __init__(self, cachefile, table):
> +        self.cachefile = cachefile
>         self.table = table
> +        self.cursor = connect(self.cachefile)
>
>         self._execute("CREATE TABLE IF NOT EXISTS %s(key TEXT, value TEXT);"
>                       % table)
> @@ -63,6 +64,8 @@ class SQLTable(collections.MutableMapping):
>             except sqlite3.OperationalError as exc:
>                 if 'database is locked' in str(exc) and count < 500:
>                     count = count + 1
> +                    self.cursor.close()
> +                    self.cursor = connect(self.cachefile)
>                     continue
>                 raise
>
> @@ -188,7 +191,7 @@ class PersistData(object):
>         del self.data[domain][key]
>
>  def connect(database):
> -    return sqlite3.connect(database, timeout=30, isolation_level=None)
> +    return sqlite3.connect(database, timeout=5, isolation_level=None)
>
>  def persist(domain, d):
>     """Convenience factory for SQLTable objects based upon metadata"""
> @@ -201,5 +204,4 @@ def persist(domain, d):
>
>     bb.utils.mkdirhier(cachedir)
>     cachefile = os.path.join(cachedir, "bb_persist_data.sqlite3")
> -    connection = connect(cachefile)
> -    return SQLTable(connection, domain)
> +    return SQLTable(cachefile, domain)
> --
> 1.7.0.4
>
>
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/bitbake-devel