From: Joshua Watt <jpewhacker@gmail.com>
To: bitbake-devel@lists.openembedded.org,
openembedded-core@lists.openembedded.org
Subject: [RFC v2 06/16] bitbake: persist_data: Close databases across fork
Date: Thu, 9 Aug 2018 17:08:30 -0500 [thread overview]
Message-ID: <20180809220840.26697-7-JPEWhacker@gmail.com> (raw)
In-Reply-To: <20180809220840.26697-1-JPEWhacker@gmail.com>
sqlite gets really angry if a database is closed across a fork() call,
and will give all sorts of messages ranging from I/O errors to database
corruption errors. To deal with this, close all database connections
before forking, and reopen them (lazily) on the other side.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
bitbake/lib/bb/persist_data.py | 44 +++++++++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 3 deletions(-)
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index f0d3ce665d9..6bd3924ffb3 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -30,6 +30,8 @@ from bb.compat import total_ordering
from collections import Mapping
import sqlite3
import contextlib
+import bb.fork
+import weakref
sqlversion = sqlite3.sqlite_version_info
if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
@@ -38,6 +40,28 @@ if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
logger = logging.getLogger("BitBake.PersistData")
+# Carrying an open database connection across a fork() confuses sqlite and
+# results in fun errors like 'database disk image is malformed'.
+# To remedy this, close all connections before forking, then they will be
+# (lazily) reopen them on the other side. This will cause a lot of problems if
+# there are threads running and trying to access the database at the same time,
+# but if you are mixing threads and fork() you have no one to blame but
+# yourself. If that is discovered to be a problem in the future, some sort of
+# per-table reader-writer lock could be used to block the fork() until all
+# pending transactions complete
+sql_table_weakrefs = []
+def _fork_before_handler():
+ for ref in sql_table_weakrefs:
+ t = ref()
+ if t is not None and t.connection is not None:
+ t.connection.close()
+ t.connection = None
+
+bb.fork.register_at_fork(before=_fork_before_handler)
+
+def _remove_table_weakref(ref):
+ sql_table_weakrefs.remove(ref)
+
@total_ordering
class SQLTable(collections.MutableMapping):
class _Decorators(object):
@@ -48,6 +72,10 @@ class SQLTable(collections.MutableMapping):
exception occurs.
"""
def wrap_func(self, *args, **kwargs):
+ # Reconnect if necessary
+ if self.connection is None:
+ self.reconnect()
+
count = 0
while True:
try:
@@ -55,8 +83,7 @@ class SQLTable(collections.MutableMapping):
except sqlite3.OperationalError as exc:
if 'is locked' in str(exc) and count < 500:
count = count + 1
- self.connection.close()
- self.connection = connect(self.cachefile)
+ self.reconnect()
continue
raise
return wrap_func
@@ -90,6 +117,11 @@ class SQLTable(collections.MutableMapping):
self._execute_single("CREATE TABLE IF NOT EXISTS %s(key TEXT PRIMARY KEY NOT NULL, value TEXT);" % table)
+ def reconnect(self):
+ if self.connection is not None:
+ self.connection.close()
+ self.connection = connect(self.cachefile)
+
@_Decorators.retry
@_Decorators.transaction
def _execute_single(self, cursor, *query):
@@ -292,4 +324,10 @@ def persist(domain, d):
bb.utils.mkdirhier(cachedir)
cachefile = os.path.join(cachedir, "bb_persist_data.sqlite3")
- return SQLTable(cachefile, domain)
+ t = SQLTable(cachefile, domain)
+
+ # Add a weak reference to the table list. The weak reference will not keep
+ # the object alive by itself, so it prevents circular reference counts
+ sql_table_weakrefs.append(weakref.ref(t, _remove_table_weakref))
+
+ return t
--
2.17.1
next prev parent reply other threads:[~2018-08-09 22:10 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 20:37 [RFC 0/9] Hash Equivalency Server Joshua Watt
2018-07-16 20:37 ` [RFC 1/9] bitbake-worker: Pass taskhash as runtask parameter Joshua Watt
2018-07-16 20:37 ` [RFC 2/9] siggen: Split out stampfile hash fetch Joshua Watt
2018-07-16 20:37 ` [RFC 3/9] siggen: Split out task depend ID Joshua Watt
2018-07-16 20:37 ` [RFC 4/9] runqueue: Track task dependency ID Joshua Watt
2018-07-16 20:37 ` [RFC 5/9] runqueue: Pass dependency ID to task Joshua Watt
2018-07-16 20:37 ` [RFC 6/9] runqueue: Pass dependency ID to hash validate Joshua Watt
2018-07-16 20:37 ` [RFC 7/9] classes/sstate: Handle depid in hash check Joshua Watt
2018-07-16 20:37 ` [RFC 8/9] hashserver: Add initial reference server Joshua Watt
2018-07-17 12:11 ` [bitbake-devel] " Richard Purdie
2018-07-17 13:44 ` Joshua Watt
2018-07-18 13:53 ` Joshua Watt
2018-07-16 20:37 ` [RFC 9/9] sstate: Implement hash equivalence sstate Joshua Watt
2018-08-09 22:08 ` [RFC v2 00/16] Hash Equivalency Server Joshua Watt
2018-08-09 22:08 ` [RFC v2 01/16] bitbake: fork: Add os.fork() wrappers Joshua Watt
2018-08-09 22:08 ` [RFC v2 02/16] bitbake: persist_data: Fix leaking cursors causing deadlock Joshua Watt
2018-08-09 22:08 ` [RFC v2 03/16] bitbake: persist_data: Add key constraints Joshua Watt
2018-08-09 22:08 ` [RFC v2 04/16] bitbake: persist_data: Enable Write Ahead Log Joshua Watt
2018-08-09 22:08 ` [RFC v2 05/16] bitbake: persist_data: Disable enable_shared_cache Joshua Watt
2018-08-09 22:08 ` Joshua Watt [this message]
2018-08-09 22:08 ` [RFC v2 07/16] bitbake: tests/persist_data: Add tests Joshua Watt
2018-08-09 22:08 ` [RFC v2 08/16] bitbake: bitbake-worker: Pass taskhash as runtask parameter Joshua Watt
2018-08-09 22:08 ` [RFC v2 09/16] bitbake: siggen: Split out stampfile hash fetch Joshua Watt
2018-08-09 22:08 ` [RFC v2 10/16] bitbake: siggen: Split out task depend ID Joshua Watt
2018-08-09 22:08 ` [RFC v2 11/16] bitbake: runqueue: Track task dependency ID Joshua Watt
2018-08-09 22:08 ` [RFC v2 12/16] bitbake: runqueue: Pass dependency ID to task Joshua Watt
2018-08-09 22:08 ` [RFC v2 13/16] bitbake: runqueue: Pass dependency ID to hash validate Joshua Watt
2018-08-09 22:08 ` [RFC v2 14/16] classes/sstate: Handle depid in hash check Joshua Watt
2018-08-09 22:08 ` [RFC v2 15/16] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2018-08-09 22:08 ` [RFC v2 16/16] sstate: Implement hash equivalence sstate Joshua Watt
2018-12-04 3:42 ` [PATCH v3 00/17] Hash Equivalency Server Joshua Watt
2018-12-04 3:42 ` [PATCH v3 01/17] bitbake: fork: Add os.fork() wrappers Joshua Watt
2018-12-04 3:42 ` [PATCH v3 02/17] bitbake: persist_data: Fix leaking cursors causing deadlock Joshua Watt
2018-12-04 3:42 ` [PATCH v3 03/17] bitbake: persist_data: Add key constraints Joshua Watt
2018-12-04 3:42 ` [PATCH v3 04/17] bitbake: persist_data: Enable Write Ahead Log Joshua Watt
2018-12-04 3:42 ` [PATCH v3 05/17] bitbake: persist_data: Disable enable_shared_cache Joshua Watt
2018-12-04 3:42 ` [PATCH v3 06/17] bitbake: persist_data: Close databases across fork Joshua Watt
2018-12-04 3:42 ` [PATCH v3 07/17] bitbake: tests/persist_data: Add tests Joshua Watt
2018-12-04 3:42 ` [PATCH v3 08/17] bitbake: bitbake-worker: Pass taskhash as runtask parameter Joshua Watt
2018-12-04 3:42 ` [PATCH v3 09/17] bitbake: siggen: Split out stampfile hash fetch Joshua Watt
2018-12-04 3:42 ` [PATCH v3 10/17] bitbake: siggen: Split out task depend ID Joshua Watt
2018-12-05 22:50 ` [bitbake-devel] " Richard Purdie
2018-12-06 14:58 ` Joshua Watt
2018-12-04 3:42 ` [PATCH v3 11/17] bitbake: runqueue: Track task dependency ID Joshua Watt
2018-12-04 3:42 ` [PATCH v3 12/17] bitbake: runqueue: Pass dependency ID to task Joshua Watt
2018-12-04 3:42 ` [PATCH v3 13/17] bitbake: runqueue: Pass dependency ID to hash validate Joshua Watt
2018-12-05 22:52 ` [bitbake-devel] " Richard Purdie
2018-12-04 3:42 ` [PATCH v3 14/17] classes/sstate: Handle depid in hash check Joshua Watt
2018-12-04 3:42 ` [PATCH v3 15/17] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2018-12-04 3:42 ` [PATCH v3 16/17] sstate: Implement hash equivalence sstate Joshua Watt
2018-12-04 3:42 ` [PATCH v3 17/17] classes/image-buildinfo: Remove unused argument Joshua Watt
2018-12-18 15:30 ` [PATCH v4 00/10] Hash Equivalency Server Joshua Watt
2018-12-18 15:30 ` [PATCH v4 01/10] bitbake: fork: Add os.fork() wrappers Joshua Watt
2018-12-18 15:30 ` [PATCH v4 02/10] bitbake: persist_data: Close databases across fork Joshua Watt
2018-12-18 15:30 ` [PATCH v4 03/10] bitbake: tests/persist_data: Add tests Joshua Watt
2018-12-18 15:30 ` [PATCH v4 04/10] bitbake: siggen: Split out task unique hash Joshua Watt
2018-12-18 15:30 ` [PATCH v4 05/10] bitbake: runqueue: Track " Joshua Watt
2018-12-18 15:30 ` [PATCH v4 06/10] bitbake: runqueue: Pass unique hash to task Joshua Watt
2018-12-18 15:30 ` [PATCH v4 07/10] bitbake: runqueue: Pass unique hash to hash validate Joshua Watt
2018-12-18 16:24 ` Richard Purdie
2018-12-18 16:31 ` Joshua Watt
2018-12-18 15:30 ` [PATCH v4 08/10] classes/sstate: Handle unihash in hash check Joshua Watt
2018-12-18 15:31 ` [PATCH v4 09/10] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2018-12-18 15:31 ` [PATCH v4 10/10] sstate: Implement hash equivalence sstate Joshua Watt
2018-12-19 3:10 ` [PATCH v5 0/8] Hash Equivalency Server Joshua Watt
2018-12-19 3:10 ` [PATCH v5 1/8] bitbake: tests/persist_data: Add tests Joshua Watt
2018-12-19 3:10 ` [PATCH v5 2/8] bitbake: siggen: Split out task unique hash Joshua Watt
2018-12-19 3:10 ` [PATCH v5 3/8] bitbake: runqueue: Track " Joshua Watt
2019-01-05 7:49 ` Alejandro Hernandez
2019-01-06 3:09 ` Joshua Watt
2019-01-07 6:52 ` Alejandro Hernandez
2019-01-07 16:16 ` akuster808
2019-01-07 16:40 ` Joshua Watt
2018-12-19 3:10 ` [PATCH v5 4/8] bitbake: runqueue: Pass unique hash to task Joshua Watt
2018-12-19 3:10 ` [PATCH v5 5/8] bitbake: runqueue: Pass unique hash to hash validate Joshua Watt
2018-12-19 3:10 ` [PATCH v5 6/8] classes/sstate: Handle unihash in hash check Joshua Watt
2018-12-19 3:10 ` [PATCH v5 7/8] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2018-12-19 3:10 ` [PATCH v5 8/8] sstate: Implement hash equivalence sstate Joshua Watt
2018-12-19 3:33 ` ✗ patchtest: failure for Hash Equivalency Server (rev3) Patchwork
2019-01-04 2:42 ` [PATCH v6 0/3] Hash Equivalency Server Joshua Watt
2019-01-04 2:42 ` [PATCH v6 1/3] classes/sstate: Handle unihash in hash check Joshua Watt
2019-01-04 7:01 ` [bitbake-devel] " Richard Purdie
2019-01-04 2:42 ` [PATCH v6 2/3] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2019-01-04 2:42 ` [PATCH v6 3/3] sstate: Implement hash equivalence sstate Joshua Watt
2019-01-04 16:20 ` [PATCH v7 0/3] Hash Equivalency Server Joshua Watt
2019-01-04 16:20 ` [PATCH v7 1/3] classes/sstate: Handle unihash in hash check Joshua Watt
2019-01-04 16:20 ` [PATCH v7 2/3] bitbake: hashserv: Add hash equivalence reference server Joshua Watt
2019-01-04 16:20 ` [PATCH v7 3/3] sstate: Implement hash equivalence sstate Joshua Watt
2019-01-08 6:29 ` [bitbake-devel] " Jacob Kroon
2019-01-09 17:09 ` Joshua Watt
2019-01-11 20:39 ` Peter Kjellerstedt
2019-01-04 16:33 ` ✗ patchtest: failure for Hash Equivalency Server (rev5) Patchwork
2019-01-04 3:03 ` ✗ patchtest: failure for Hash Equivalency Server (rev4) Patchwork
2018-12-18 16:03 ` ✗ patchtest: failure for Hash Equivalency Server (rev2) Patchwork
2018-12-04 4:05 ` ✗ patchtest: failure for Hash Equivalency Server Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180809220840.26697-7-JPEWhacker@gmail.com \
--to=jpewhacker@gmail.com \
--cc=bitbake-devel@lists.openembedded.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox