jaaql-middleware-python 5.3.9__tar.gz → 5.3.11__tar.gz

{jaaql_middleware_python-5.3.9 → jaaql_middleware_python-5.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.9
+Version: 5.3.11
 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.9 → jaaql_middleware_python-5.3.11}/jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.9"
+VERSION = "5.3.11"
 

{jaaql_middleware_python-5.3.9 → jaaql_middleware_python-5.3.11}/jaaql/db/db_utils_no_circ.py

@@ -1,8 +1,8 @@
 from jaaql.mvc.exception_queries import QUERY__fetch_application_schemas, KG__application_schema__application, KG__application__is_live, \
     KG__application_schema__name, KEY__is_default
 from queue import Queue
-from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_db, ERR__schema_invalid
-from jaaql.exceptions.http_status_exception import HttpStatusException
+from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_db, ERR__schema_invalid, CONN_LOST__max_attempts
+from jaaql.exceptions.http_status_exception import HttpStatusException, ConnectionLostError
 from jaaql.interpreter.interpret_jaaql import InterpretJAAQL
 from jaaql.constants import KEY__application, KEY__database, KEY__schema, KEY__role, DB__jaaql, \
     KEY__read_only, KEY__prevent_unused_parameters
@@ -76,11 +76,23 @@ def submit(vault, config, db_crypt_key, jaaql_connection: DBInterface, inputs: d
 
     prevent_unused = inputs.pop(KEY__prevent_unused_parameters) if KEY__prevent_unused_parameters in inputs else True
 
-    ret = InterpretJAAQL(required_db, jaaql_connection
-                         ).transform(inputs, skip_commit=inputs.get(KEY__read_only), wait_hook=verification_hook,
-                                     encryption_key=db_crypt_key, conn=conn,
-                                     canned_query_service=cached_canned_query_service, prevent_unused_parameters=prevent_unused,
-                                     and_return_connection_mid_transaction=keep_alive_conn, prepare_statements=prepare_statements)
+    # A lost connection committed nothing, so re-running on a fresh connection is safe. \wipe dbms kills
+    # pooled connections, so a request landing on one dies at commit ("the connection is lost") - retry
+    # it. Only when transform owns the connection (conn is None); otherwise the caller manages the
+    # transaction and must handle the loss itself.
+    attempts = 0
+    while True:
+        attempts += 1
+        try:
+            ret = InterpretJAAQL(required_db, jaaql_connection
+                                 ).transform(inputs, skip_commit=inputs.get(KEY__read_only), wait_hook=verification_hook,
+                                             encryption_key=db_crypt_key, conn=conn,
+                                             canned_query_service=cached_canned_query_service, prevent_unused_parameters=prevent_unused,
+                                             and_return_connection_mid_transaction=keep_alive_conn, prepare_statements=prepare_statements)
+            break
+        except ConnectionLostError:
+            if conn is not None or attempts >= CONN_LOST__max_attempts:
+                raise
 
     if as_objects:
         ret = objectify(ret, singleton=singleton)

{jaaql_middleware_python-5.3.9 → jaaql_middleware_python-5.3.11}/jaaql/mvc/model.py

@@ -1462,6 +1462,27 @@ WHERE
         # handed a dead connection whose commit silently fails. Runs once per wipe - no per-request cost.
         DBPGInterface.check_all_pools()
 
+        if self.is_container:
+            # A \wipe dbms reinstall leaves every gunicorn/gevent worker holding pooled connections to
+            # the now-wiped databases. The gunicorn was_installed + child_exit mechanism restarts the
+            # server to get fresh workers, but it fires on the NEXT worker exit - non-deterministic, so
+            # build requests race the bounce (504s / connections lost mid-transaction). Instead disable
+            # that path (remove the marker) and restart DETERMINISTICALLY just after this response is
+            # sent, so the caller's post-wipe health-wait sees a clean down-then-up and every subsequent
+            # request lands on a fresh worker. SIGQUIT to the gunicorn master (our parent) = the same
+            # bounce child_exit performs; the container relaunches it.
+            try:
+                os.unlink(os.path.join("vault", "was_installed"))
+            except FileNotFoundError:
+                pass
+            master_pid = os.getppid()
+
+            def _deterministic_restart():
+                time.sleep(1)  # let /internal/clean's 200 reach the caller before we bounce the server
+                os.kill(master_pid, signal.SIGQUIT)
+
+            threading.Thread(target=_deterministic_restart, daemon=True).start()
+
     def execute_migrations(self, connection: DBInterface):
         self.is_super_admin(connection)
 

{jaaql_middleware_python-5.3.9 → jaaql_middleware_python-5.3.11}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.9
+Version: 5.3.11
 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