Merge pull request #126 from man-group/fix-ubuntu-22-build

Fix ubuntu 22 build

Author: jonbannister

.circleci/config.yml

@@ -42,6 +42,11 @@ defaults: &defaults
 
             cat /etc/os-release
             set -x
+            # ------ (2022-10-28) install libssl1.1 since mongo doesn't support Ubuntu 22.04 which has libssl v3 
+            echo "deb http://security.ubuntu.com/ubuntu focal-security main" | sudo tee /etc/apt/sources.list.d/focal-security.list
+            sudo apt-get update
+            sudo apt-get install libssl1.1
+            # -------
             wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -
             sudo apt-get install gnupg
             wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -

CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.6 (2022-??-??)
+------------------
+
+* Bugfix: Small bugfix for synchronous report execution
+
+
 0.4.5 (2022-09-29)
 ------------------
 

notebooker/execute_notebook.py

@@ -387,6 +387,7 @@ def execute_notebook_entrypoint(
         )
         if result.mailto:
             send_result_email(result, config.DEFAULT_MAILFROM)
+        logger.info(f"Here is the result!{result}")
         if isinstance(result, NotebookResultError):
             logger.warning("Notebook execution failed! Output was:")
             logger.warning(repr(result))

notebooker/web/routes/run_report.py

@@ -160,6 +160,7 @@ def run_report(
     scheduler_job_id=None,
     run_synchronously=False,
     mailfrom=None,
+    n_retries=3,
 ) -> str:
     """
     Actually run the report in earnest.
@@ -173,6 +174,7 @@ def run_report(
     :param scheduler_job_id: `Optional[str]` if the job was triggered from the scheduler, this is the scheduler's job id
     :param run_synchronously: `bool` If True, then we will join the stderr monitoring thread until the job has completed
     :param mailfrom: `str` if passed, then this string will be used in the from field
+    :param n_retries: The number of retries to attempt.
     :return: The unique job_id.
     """
     job_id = str(uuid.uuid4())
@@ -222,17 +224,13 @@ def run_report(
             json.dumps(overrides),
             "--pdf-output" if generate_pdf_output else "--no-pdf-output",
             "--hide-code" if hide_code else "--show-code",
+            "--n-retries", str(n_retries),
         ]
         + (["--prepare-notebook-only"] if prepare_only else [])
         + ([f"--scheduler-job-id={scheduler_job_id}"] if scheduler_job_id is not None else [])
         + ([f"--mailfrom={mailfrom}"] if mailfrom is not None else [])
     )
     p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    time.sleep(5)
-    p.poll()
-    if p.returncode:
-        error_msg = "".join([chr(n) for n in p.stderr.read()])
-        raise RuntimeError(f"The process failed with the message: {error_msg}")
 
     stderr_thread = threading.Thread(
         target=_monitor_stderr,
@@ -241,7 +239,12 @@ def run_report(
     stderr_thread.daemon = True
     stderr_thread.start()
     if run_synchronously:
-        stderr_thread.join(120)  # 2 minutes should be enough
+        p.wait()
+    else:
+        time.sleep(1)
+        p.poll()
+    if p.returncode:
+        raise RuntimeError(f"The report execution failed with exit code {p.returncode}")
 
     return job_id
 

tests/integration/test_e2e.py

@@ -72,15 +72,18 @@ def test_run_failing_report(bson_library, flask_app, setup_and_cleanup_notebooke
         report_name = "fake/report_failing"
         report_title = "my report title"
         mailto = ""
-        job_id = run_report(
-            report_name,
-            report_title,
-            mailto,
-            overrides,
-            generate_pdf_output=False,
-            prepare_only=False,
-            run_synchronously=True,
-        )
+        with pytest.raises(RuntimeError, match=".*The report execution failed with exit code .*"):
+            run_report(
+                report_name,
+                report_title,
+                mailto,
+                overrides,
+                generate_pdf_output=False,
+                prepare_only=False,
+                run_synchronously=True,
+                n_retries=0,
+            )
+        job_id = bson_library.find_one()["job_id"]
         result = _get_report_output(job_id, serialiser)
         assert result.status == JobStatus.ERROR
         assert result.error_info