Add close method to SqliteAccountInfo, explicitly close temporary connections

Author: olzhasar-reef

b2sdk/_internal/account_info/sqlite_account_info.py

@@ -17,6 +17,7 @@
 import stat
 import sys
 import threading
+from contextlib import contextmanager
 
 from .exception import CorruptAccountInfo, MissingAccountData
 from .upload_url_pool import UrlPoolAccountInfo
@@ -152,7 +153,7 @@ def _validate_database(self, last_upgrade_to_run=None):
 
         # If we can connect to the database, and do anything, then all is good.
         try:
-            with self._connect() as conn:
+            with self._temp_connection() as conn:
                 self._create_tables(conn, last_upgrade_to_run)
                 return
         except sqlite3.DatabaseError:
@@ -178,7 +179,7 @@ def _validate_database(self, last_upgrade_to_run=None):
                 # create a database
                 self._create_database(last_upgrade_to_run)
                 # add the data from the JSON file
-                with self._connect() as conn:
+                with self._temp_connection() as conn:
                     self._create_tables(conn, last_upgrade_to_run)
                     insert_statement = """
                         INSERT INTO account
@@ -214,6 +215,24 @@ def _get_connection(self):
     def _connect(self):
         return sqlite3.connect(self.filename, isolation_level='EXCLUSIVE')
 
+    @contextmanager
+    def _temp_connection(self):
+        """A one-off sqlite connection for setup purposes, that is not cached in thread_local."""
+        conn = self._connect()
+        try:
+            with conn:
+                yield conn
+        finally:
+            conn.close()
+
+    def close(self):
+        connection = getattr(self.thread_local, 'connection', None)
+        if connection is None:
+            return
+
+        connection.close()
+        del self.thread_local.connection
+
     def _create_database(self, last_upgrade_to_run):
         """
         Make sure that the database is created and has appropriate file permissions.

changelog.d/+sqlite-account-info-connections.fixed.md

@@ -0,0 +1 @@
+Fix `SqliteAccountInfo` to explicitly close temporary sqlite connections used during setup, add a `close()` method for cached connection.