Merge remote-tracking branch 'origin/master' into query-stats-4

.github/workflows.src/build.inc.yml

@@ -1,8 +1,8 @@
 <% macro workflow(targets, publications, subdist="", publish_all=False) %>
   prep:
     runs-on: ubuntu-latest
-    outputs:
 <% if subdist == "nightly" %>
+    outputs:
 <% for tgt in targets.linux + targets.macos %>
       if_<< tgt.name.replace('-', '_') >>: ${{ steps.scm.outputs.if_<< tgt.name.replace('-', '_') >> }}
 <% endfor %>

edb/server/dbview/dbview.pyi

@@ -118,6 +118,9 @@ class Database:
     def lookup_config(self, name: str) -> Any:
         ...
 
+    def is_introspected(self) -> bool:
+        ...
+
 class DatabaseConnectionView:
     def in_tx(self) -> bool:
         ...

edb/server/dbview/dbview.pyx

@@ -453,6 +453,9 @@ cdef class Database:
                 if self.user_schema_pickle is None:
                     await self.tenant.introspect_db(self.name)
 
+    def is_introspected(self):
+        return self.user_schema_pickle is not None
+
     def lookup_config(self, name: str):
         spec = self._index._sys_config_spec
         if self.user_config_spec is not None:

edb/server/net_worker.py

@@ -120,7 +120,7 @@ async def http(server: edbserver.BaseServer) -> None:
                     tasks.append(
                         tenant.create_task(
                             _http_task(tenant, tenant_http[tenant]),
-                            interruptable=False,
+                            interruptable=True,
                         )
                     )
             # Remove unused tenant_http entries
@@ -310,7 +310,7 @@ async def gc(server: edbserver.BaseServer) -> None:
     while True:
         tasks = [
             tenant.create_task(
-                _gc(tenant, NET_HTTP_REQUEST_TTL), interruptable=False
+                _gc(tenant, NET_HTTP_REQUEST_TTL), interruptable=True
             )
             for tenant in server.iter_tenants()
             if tenant.accept_new_tasks

edb/server/protocol/auth_ext/email.py

@@ -131,7 +131,7 @@ async def noop_coroutine() -> None:
 async def _protected_send(
     coro: Coroutine[Any, Any, None], tenant: tenant.Tenant
 ) -> None:
-    task = tenant.create_task(coro, interruptable=False)
+    task = tenant.create_task(coro, interruptable=True)
     # Prevent timing attack
     await asyncio.sleep(random.random() * 0.5)
     # Expose e.g. configuration errors

edb/server/protocol/auth_ext/pkce.py

@@ -193,7 +193,7 @@ async def gc(server: edbserver.BaseServer) -> None:
     while True:
         try:
             tasks = [
-                tenant.create_task(_gc(tenant), interruptable=False)
+                tenant.create_task(_gc(tenant), interruptable=True)
                 for tenant in server.iter_tenants()
                 if tenant.accept_new_tasks
             ]

edb/server/tenant.py

@@ -591,6 +591,18 @@ def stop_accepting_connections(self) -> None:
     def accept_new_tasks(self):
         return self._accept_new_tasks
 
+    def is_db_ready(self, dbname: str) -> bool:
+        if not self._accept_new_tasks:
+            return False
+
+        if (
+            not (db := self.maybe_get_db(dbname=dbname))
+            or not db.is_introspected()
+        ):
+            return False
+
+        return True
+
     def create_task(
         self,
         coro: Coroutine,
@@ -962,7 +974,8 @@ def allow_database_connections(self, dbname: str) -> None:
 
     def is_database_connectable(self, dbname: str) -> bool:
         return (
-            dbname != defines.EDGEDB_TEMPLATE_DB
+            self._running
+            and dbname != defines.EDGEDB_TEMPLATE_DB
             and dbname not in self._block_new_connections
         )
 
@@ -1662,7 +1675,7 @@ async def task():
         self.create_task(task(), interruptable=True)
 
     def on_remote_ddl(self, dbname: str) -> None:
-        if not self._accept_new_tasks:
+        if not self.is_db_ready(dbname):
             return
 
         # Triggered by a postgres notification event 'schema-changes'
@@ -1826,7 +1839,7 @@ def on_remote_query_cache_change(
         dbname: str,
         keys: Optional[list[str]],
     ) -> None:
-        if not self._accept_new_tasks:
+        if not self.is_db_ready(dbname):
             return
 
         async def task():