jaaql-middleware-python 5.3.1__py3-none-any.whl → 5.3.3__py3-none-any.whl

jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.1"
+VERSION = "5.3.3"
 

jaaql/db/db_pg_interface.py

@@ -22,6 +22,18 @@ PGCONN__max_conns = 10
 
 TIMEOUT = 2.5
 
+# Upper bound on how long a request waits for the parallel auth verifier's verdict before failing
+# closed. Kept below the nginx proxy read timeout so the worker unwinds and returns its connection
+# rather than the request dying at the proxy while the worker hangs on holding an open transaction.
+WAIT_HOOK__timeout = 30
+ERR__verification_timed_out = "Authorization verification timed out"
+
+# libpq TCP keepalives: detect a peer that vanishes (DB reboot, network drop) within ~25s so the
+# socket errors instead of a read blocking indefinitely. Without this the single serial
+# auth-verification thread can wedge forever on a dead connection and, via the wait below, take
+# every authenticated request down with it. Ignored by libpq for unix-socket connections.
+CONN_STR__keepalives = " keepalives=1 keepalives_idle=10 keepalives_interval=5 keepalives_count=3"
+
 ERR__invalid_role = "Role not allowed, invalid format!"
 ERR__must_use_canned_query = "Must use canned query as you are not an admin!"
 
@@ -199,6 +211,8 @@ class DBPGInterface(DBInterface):
                 if str(port) != "5432":
                     conn_str += " port=" + str(port)
 
+                conn_str += CONN_STR__keepalives
+
                 self.conn_str = conn_str
 
                 if self.db_name not in user_pool:
@@ -309,7 +323,14 @@ class DBPGInterface(DBInterface):
                     do_prepare = prepare and _statement_is_preparable(query)
 
                     if wait_hook:
-                        res, err, code = wait_hook.get()
+                        try:
+                            res, err, code = wait_hook.get(timeout=WAIT_HOOK__timeout)
+                        except queue.Empty:
+                            # The parallel verifier never delivered a verdict (its single serial thread
+                            # wedged, e.g. on a connection killed by a DB reboot). Fail closed and let
+                            # the worker unwind - without this bound the worker blocks forever holding
+                            # an open transaction, and enough of them starve the pool into nginx 504s.
+                            raise Exception(ERR__verification_timed_out)
                         if not res:
                             if code == 500:
                                 raise Exception(err)
@@ -328,14 +349,18 @@ class DBPGInterface(DBInterface):
                     if pending_auth:
                         auth_cursor = conn.jaaql_raw_cursor()
                         try:
-                            # Pipeline mode forces the extended protocol on every execute, and the
-                            # extended protocol rejects a multi-command string ("cannot insert
-                            # multiple commands into a prepared statement"). Only pipeline
-                            # single-command queries; a multi-command query (install scripts,
-                            # interpreted/canned SQL run during a bump) falls back to sequential
-                            # execution, where the main query runs under the simple protocol that
-                            # permits several commands.
-                            if PIPELINE_SUPPORTED and _statement_is_preparable(query):
+                            # Pipeline mode is unsafe for two kinds of statement, so restrict it to
+                            # single-command queries on transactional (non-autocommit) connections;
+                            # everything else falls back to sequential execution:
+                            #  - it forces the extended protocol on every execute, which rejects a
+                            #    multi-command string ("cannot insert multiple commands into a
+                            #    prepared statement"); the sequential fallback runs the main query
+                            #    under the simple protocol that permits several commands.
+                            #  - it wraps statements in an implicit transaction, which statements
+                            #    that cannot run in a transaction block (CREATE DATABASE, VACUUM,
+                            #    CREATE INDEX CONCURRENTLY, ...) reject. JAAQL runs those with
+                            #    autocommit=True, so skipping the pipeline there keeps them standalone.
+                            if PIPELINE_SUPPORTED and _statement_is_preparable(query) and not conn.autocommit:
                                 with conn.pipeline():
                                     for statement in pending_auth:
                                         auth_cursor.execute(statement)

{jaaql_middleware_python-5.3.1.dist-info → jaaql_middleware_python-5.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.1
+Version: 5.3.3
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql_middleware_python-5.3.1.dist-info → jaaql_middleware_python-5.3.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 jaaql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaaql/config_constants.py,sha256=puoR6jfbXw8oXXEfbYNn2ysGwgiGTyuDjOj7F8acsTE,470
-jaaql/constants.py,sha256=DhHVNMagAP6vunKC977tdltQbdWyE2C1m2jBA7-HO-A,7355
+jaaql/constants.py,sha256=ocgDdVs0zked7wQ2_gh_LHKk9KO4rujsTTnNc2mI_Qc,7355
 jaaql/generated_constants.py,sha256=pxmpTux7rrjJH6iqLb-R8RKJ4t0CeoGdnspjH5DiWgU,11327
 jaaql/jaaql.py,sha256=bfiEW9A8PlZIVjDJd_LOhCLBL8flc_f7w0umR6EWbU4,6614
 jaaql/patch.py,sha256=VE4B6jA492NCIxNIewbynh92jxVulmRFtB9hNEe6q94,149
@@ -10,7 +10,7 @@ jaaql/config/config-test.ini,sha256=ap9OFqCCbYdWqmUKq0p9GD1IkM4CzeTXDV5gbQGQZoQ,
 jaaql/config/config.ini,sha256=o1orXNYRFgf09MKzZBQ3v0oMzWn7N6KwvX5YV0WJtns,321
 jaaql/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaaql/db/db_interface.py,sha256=n4pwRHeGpkbmTOvZDe8VvqFf2l4QsE9GbhUBzW335m0,7702
-jaaql/db/db_pg_interface.py,sha256=xhNFJZd8elQgXEMlgaxEom9a2KgbtqCsPlMbH_wFYYk,19143
+jaaql/db/db_pg_interface.py,sha256=zBZUkfbbmN8WU6gz0vLiZv10QKd1e7muhx0zP6yekt4,21098
 jaaql/db/db_utils.py,sha256=xZCdtWT9semzLL-NAiwMFx_38Wv96BBv60pfPYNDnCc,7761
 jaaql/db/db_utils_no_circ.py,sha256=WLhk6EwsnTdLGUAjq3RZBH3FzgwEumh45A24WWysWmQ,4666
 jaaql/documentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,8 +66,8 @@ jaaql/utilities/options.py,sha256=75M7-oSeY4wmHGz3-su_c36yf_Csv9HxvTG7aRlGR0A,49
 jaaql/utilities/utils.py,sha256=nVYVhuHtWSjdaJaXe9eC1Usja56NO-V9SoBIlcHAK8Q,5166
 jaaql/utilities/utils_no_project_imports.py,sha256=YwcskR15dAqKdEiuF8zGx-tzwWkclSGil_zm_qZ8ylU,4626
 jaaql/utilities/vault.py,sha256=DudyQNtMtaRLL71IGQX0AI16Tg1id98BHTCQPyUNkmE,2243
-jaaql_middleware_python-5.3.1.dist-info/licenses/LICENSE.txt,sha256=wr50eN0TnkrCSuNwyiI81FLZqmrW3q0JqRlVVQIrGA0,18134
-jaaql_middleware_python-5.3.1.dist-info/METADATA,sha256=Zf6gk_QDs_yHZRWltNnQnEnTvsJ6JH8mUhoNHcccH60,1976
-jaaql_middleware_python-5.3.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jaaql_middleware_python-5.3.1.dist-info/top_level.txt,sha256=k5aKVQy77bPyfyNHITvo5m3FqdSAiiXbjT5S9D9KzgU,6
-jaaql_middleware_python-5.3.1.dist-info/RECORD,,
+jaaql_middleware_python-5.3.3.dist-info/licenses/LICENSE.txt,sha256=wr50eN0TnkrCSuNwyiI81FLZqmrW3q0JqRlVVQIrGA0,18134
+jaaql_middleware_python-5.3.3.dist-info/METADATA,sha256=oEe5Uk6pBPUmldYY9N9IKLjQU-XWreZiDXBGCxkZusw,1976
+jaaql_middleware_python-5.3.3.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jaaql_middleware_python-5.3.3.dist-info/top_level.txt,sha256=k5aKVQy77bPyfyNHITvo5m3FqdSAiiXbjT5S9D9KzgU,6
+jaaql_middleware_python-5.3.3.dist-info/RECORD,,