dbos 0.22.0a10__py3-none-any.whl → 0.23.0__py3-none-any.whl

dbos/_recovery.py

@@ -4,6 +4,8 @@ import time
 import traceback
 from typing import TYPE_CHECKING, Any, List
 
+from dbos._utils import GlobalParams
+
 from ._core import execute_workflow_by_id
 from ._error import DBOSWorkflowFunctionNotFoundError
 from ._sys_db import GetPendingWorkflowsOutput
@@ -12,6 +14,16 @@ if TYPE_CHECKING:
     from ._dbos import DBOS, WorkflowHandle
 
 
+def _recover_workflow(
+    dbos: "DBOS", workflow: GetPendingWorkflowsOutput
+) -> "WorkflowHandle[Any]":
+    if workflow.queue_name and workflow.queue_name != "_dbos_internal_queue":
+        cleared = dbos._sys_db.clear_queue_assignment(workflow.workflow_uuid)
+        if cleared:
+            return dbos.retrieve_workflow(workflow.workflow_uuid)
+    return execute_workflow_by_id(dbos, workflow.workflow_uuid)
+
+
 def startup_recovery_thread(
     dbos: "DBOS", pending_workflows: List[GetPendingWorkflowsOutput]
 ) -> None:
@@ -21,13 +33,7 @@ def startup_recovery_thread(
     while not stop_event.is_set() and len(pending_workflows) > 0:
         try:
             for pending_workflow in list(pending_workflows):
-                if (
-                    pending_workflow.queue_name
-                    and pending_workflow.queue_name != "_dbos_internal_queue"
-                ):
-                    dbos._sys_db.clear_queue_assignment(pending_workflow.workflow_uuid)
-                    continue
-                execute_workflow_by_id(dbos, pending_workflow.workflow_uuid)
+                _recover_workflow(dbos, pending_workflow)
                 pending_workflows.remove(pending_workflow)
         except DBOSWorkflowFunctionNotFoundError:
             time.sleep(1)
@@ -41,29 +47,22 @@ def startup_recovery_thread(
 def recover_pending_workflows(
     dbos: "DBOS", executor_ids: List[str] = ["local"]
 ) -> List["WorkflowHandle[Any]"]:
+    """Attempt to recover pending workflows for a list of specific executors and return workflow handles for them."""
     workflow_handles: List["WorkflowHandle[Any]"] = []
     for executor_id in executor_ids:
-        dbos.logger.debug(f"Recovering pending workflows for executor: {executor_id}")
         pending_workflows = dbos._sys_db.get_pending_workflows(
-            executor_id, dbos.app_version
+            executor_id, GlobalParams.app_version
         )
         for pending_workflow in pending_workflows:
-            if (
-                pending_workflow.queue_name
-                and pending_workflow.queue_name != "_dbos_internal_queue"
-            ):
-                try:
-                    dbos._sys_db.clear_queue_assignment(pending_workflow.workflow_uuid)
-                    workflow_handles.append(
-                        dbos.retrieve_workflow(pending_workflow.workflow_uuid)
-                    )
-                except Exception as e:
-                    dbos.logger.error(e)
-            else:
-                workflow_handles.append(
-                    execute_workflow_by_id(dbos, pending_workflow.workflow_uuid)
+            try:
+                handle = _recover_workflow(dbos, pending_workflow)
+                workflow_handles.append(handle)
+            except Exception as e:
+                dbos.logger.error(
+                    f"Exception encountered when recovering workflows: {traceback.format_exc()}"
                 )
+                raise e
         dbos.logger.info(
-            f"Recovering {len(pending_workflows)} workflows from version {dbos.app_version}"
+            f"Recovering {len(pending_workflows)} workflows for executor {executor_id} from version {GlobalParams.app_version}"
         )
     return workflow_handles

dbos/_schemas/system_database.py

@@ -154,7 +154,7 @@ class SystemSchema:
             nullable=False,
             primary_key=True,
         ),
-        Column("executor_id", Text),
+        # Column("executor_id", Text), # This column is deprecated. Do *not* use it.
         Column("queue_name", Text, nullable=False),
         Column(
             "created_at_epoch_ms",