jaaql-middleware-python 5.3.14__tar.gz → 5.3.18__tar.gz

{jaaql_middleware_python-5.3.14 → jaaql_middleware_python-5.3.18}/PKG-INFO

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

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.14"
+VERSION = "5.3.18"
 

{jaaql_middleware_python-5.3.14 → jaaql_middleware_python-5.3.18}/jaaql/mvc/model.py

@@ -27,6 +27,7 @@ from jaaql.exceptions.jaaql_interpretable_handled_errors import *
 from jaaql.db.db_pg_interface import DBPGInterface, QUERY__dba_query_external
 from jaaql.email.email_manager_service import EmailAttachment
 from jaaql.mvc.base_model import BaseJAAQLModel, VAULT_KEY__jwt_crypt_key
+from jaaql.utilities.bootstrap_secrets import get_or_seed_vault_secret
 from jaaql.exceptions.http_status_exception import HttpStatusException, ERR__already_installed, HttpSingletonStatusException
 from os.path import join
 from jaaql.interpreter.interpret_jaaql import KEY_query, KEY_parameters
@@ -1489,7 +1490,7 @@ WHERE
             master_pid = os.getppid()
 
             def _deterministic_restart():
-                time.sleep(1)  # let /internal/clean's 200 reach the caller before we bounce the server
+                time.sleep(0.2)  # 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()
@@ -1519,6 +1520,21 @@ WHERE
         sql = self._lookup_cached_query(QUERY_CACHE_REF__health)
         execute_supplied_statement_singleton(self.jaaql_lookup_connection, sql, as_objects=True)
 
+    def install_on_bootup(self):
+        # Called from the gunicorn master (docker/gunicorn_config.py, when_ready) while preload_app has
+        # built this model and no worker has forked yet, so every worker starts already installed. The
+        # migrations manager still installs over HTTP if this does not run, but that path installs inside
+        # one worker and then has to bounce the whole master (child_exit) before the others can see it.
+        if not self.is_container or self.has_installed:
+            return
+        super_db_password = get_or_seed_vault_secret(self.vault, VAULT_KEY__super_db_password, "SUPER_PASSWORD", generate_if_missing=True)
+        jaaql_password = get_or_seed_vault_secret(self.vault, VAULT_KEY__jaaql_password, "JAAQL_PASSWORD", generate_if_missing=True)
+        self.install(None, jaaql_password, super_db_password, self.install_key, True, do_reboot=False)
+        # Nothing may carry a pooled connection across the fork; each worker opens its own in post_worker_init
+        if self.jaaql_lookup_connection is not None:
+            self.jaaql_lookup_connection.close()
+        DBPGInterface.close_all_pools()
+
     def install(self, db_connection_string: str, jaaql_password: str, super_db_password: str, install_key: str, allow_uninstall: bool,
                 do_reboot: bool = True, jaaql_db_password: str = None):
         if self.jaaql_lookup_connection is None:
@@ -1544,6 +1560,14 @@ WHERE
 
             super_interface = create_interface(self.config, address, port, DB__jaaql, username, db_password)
             conn = super_interface.get_conn()
+            # A wipe leaves a window where background services (cron, EMS poller, auth verifier)
+            # reconnect and can abandon an open transaction holding locks on the fresh jaaql tables.
+            # The install DDL below would then queue behind that lock forever (no lock_timeout),
+            # wedging /internal/clean into an nginx 504. Kill the strays and bound every lock wait so
+            # a re-raced install fails fast (and can be retried) instead of hanging
+            super_interface.execute_query(conn, "SELECT pg_terminate_backend(pid) FROM pg_stat_activity "
+                                                "WHERE datname = current_database() AND pid <> pg_backend_pid()")
+            super_interface.execute_query(conn, "SET lock_timeout TO '10s'")
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "01.install_domains.generated.sql"))
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "02.install_super_user.exceptions.sql"))
             super_interface.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts, "03.install_super_user.handwritten.sql"))
@@ -1560,6 +1584,7 @@ WHERE
 
             self.jaaql_lookup_connection = create_interface(self.config, address, port, DB__jaaql, ROLE__jaaql, jaaql_db_password)
             conn = self.jaaql_lookup_connection.get_conn()
+            self.jaaql_lookup_connection.execute_query(conn, "SET lock_timeout TO '10s'")
             self.jaaql_lookup_connection.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts,
                                                                         "04.install_jaaql_data_structures.generated.sql"))
             self.jaaql_lookup_connection.execute_script_file(conn, join(get_jaaql_root(), DIR__scripts,

{jaaql_middleware_python-5.3.14 → jaaql_middleware_python-5.3.18}/jaaql_middleware_python.egg-info/PKG-INFO

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