[bitbake-devel] bitbake: persist_data: Fix Locking Protocol Error

Submitted by Joshua Watt on Jan. 3, 2019, 4:36 p.m. | Patch ID: 157543

Details

Message ID 20190103163611.7736-1-JPEWhacker@gmail.com
State New
Headers show

Commit Message

Joshua Watt Jan. 3, 2019, 4:36 p.m.
Under heavy load with process delays, sqlite can issues a "locking
protocol" error (SQLITE_PROTOCOL). Unfortunately, it is impossible to
distinguish between actual locking protocol errors and this race
condition, so they best that can be done is to retry the operation when
the error is detected.

[YOCTO #13108]

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 bitbake/lib/bb/persist_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 4468facd18f..0d44100f103 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -59,7 +59,7 @@  class SQLTable(collections.MutableMapping):
                         try:
                             return f(self, *args, **kwargs)
                         except sqlite3.OperationalError as exc:
-                            if 'is locked' in str(exc) and count < 500:
+                            if count < 500 and ('is locked' in str(exc) or 'locking protocol' in str(exc)):
                                 count = count + 1
                                 if reconnect:
                                     self.reconnect()