statisticsnorway
diff --git a/‎.test.env‎
Lines changed: 0 additions & 9 deletions b/‎.test.env‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎job_executor/app.py‎
Lines changed: 27 additions & 80 deletions b/‎job_executor/app.py‎
Lines changed: 27 additions & 80 deletions
@@ -1,112 +1,59 @@
 import logging
 import time
-from multiprocessing import Queue
-from pathlib import Path
 
 from job_executor.adapter import datastore_api
-from job_executor.adapter.datastore_api.models import JobStatus
 from job_executor.adapter.fs import LocalStorageAdapter
 from job_executor.common.exceptions import StartupException
 from job_executor.config import environment
-from job_executor.config.log import initialize_logging_thread, setup_logging
+from job_executor.config.log import setup_logging
 from job_executor.domain import rollback
 from job_executor.domain.manager import Manager
 
 logger = logging.getLogger()
 setup_logging()
 
 
-def initialize_app() -> None:
+def initialize_app() -> Manager:
+    """
+    Initializing the datastore by rolling back any unfinished jobs in any
+    datastore, and checking if any datastores have unresolved temporary backups.
+
+    Returns a manager if all datastores appear healthy.
+    """
     try:
         rollback.fix_interrupted_jobs()
-        rdns = datastore_api.get_datastores()
-        for rdn in rdns:
-            local_storage = LocalStorageAdapter(Path(environment.datastore_dir))
+        for rdn in datastore_api.get_datastores():
+            local_storage = LocalStorageAdapter(
+                datastore_api.get_datastore_directory(rdn)
+            )
             if local_storage.datastore_dir.temporary_backup_exists():
                 raise StartupException(f"tmp directory exists for {rdn}")
-    except Exception as e:
-        raise StartupException("Exception when initializing") from e
-
-
-def handle_jobs(manager: Manager, logging_queue: Queue) -> None:
-    job_query_result = datastore_api.query_for_jobs()
-    manager.clean_up_after_dead_workers()
-    if job_query_result.available_jobs_count:
-        logger.info(
-            f"Found {len(job_query_result.queued_worker_jobs)}"
-            f"/{len(job_query_result.built_jobs)}"
-            f"/{len(job_query_result.queued_manager_jobs)}"
-            f" (worker, built, queued manager jobs)"
-        )
-
-    for job in job_query_result.queued_worker_jobs:
-        local_storage = LocalStorageAdapter(
-            datastore_api.get_datastore_directory(job.datastore_rdn)
-        )
-        job_size = local_storage.input_dir.get_importable_tar_size_in_bytes(
-            job.parameters.target
-        )
-        if job_size == 0:
-            logger.error(f"{job.job_id} Failed to get the size of the dataset.")
-            datastore_api.update_job_status(
-                job.job_id,
-                JobStatus.FAILED,
-                log="No such dataset available for import",
-            )
-            continue  # skip futher processing of this job
-        if job_size > manager.max_bytes_all_workers:
-            logger.warning(
-                f"{job.job_id} Exceeded the maximum size for all workers."
-            )
-            datastore_api.update_job_status(
-                job.job_id,
-                JobStatus.FAILED,
-                log="Dataset too large for import",
-            )
-            continue  # skip futher processing of this job
-        if manager.can_spawn_new_worker(job_size):
-            manager.handle_worker_job(job, job_size, logging_queue)
-
-    for job in job_query_result.queued_manager_and_built_jobs():
-        try:
-            manager.handle_manager_job(job)
-        except Exception as exc:
-            # All exceptions that occur during the handling of a job
-            # are resolved by rolling back. The exceptions that
-            # reach here are exceptions raised by the rollback.
-            logger.exception(
-                f"{job.job_id} failed and could not roll back",
-                exc_info=exc,
-            )
-            raise exc
-
-
-def main() -> None:
-    logging_queue = None
-    log_thread = None
-    try:
-        initialize_app()
-        logging_queue, log_thread = initialize_logging_thread()
-        manager = Manager(
+        return Manager(
             max_workers=environment.number_of_workers,
             max_bytes_all_workers=(
                 environment.max_gb_all_workers * 1024**3
             ),  # Covert from GB to bytes
         )
+    except Exception as e:
+        raise StartupException("Exception when initializing") from e
 
+
+def main() -> None:
+    manager = initialize_app()
+    try:
         while True:
             time.sleep(5)
-            handle_jobs(manager, logging_queue)
+            job_query_result = datastore_api.query_for_jobs()
+            manager.handle_jobs(job_query_result)
     except Exception as e:
-        logger.exception("Service stopped by exception", exc_info=e)
+        raise e
     finally:
-        # Tell the logging thread to finish up
-        if logging_queue is not None:
-            logging_queue.put(None)
-        if log_thread is not None:
-            log_thread.join()
+        manager.close_logging_thread()
 
 
 if __name__ == "__main__":
     logger.info("Polling for jobs...")
-    main()
+    try:
+        main()
+    except Exception as e:
+        logger.exception("Service stopped by exception", exc_info=e)