Merge remote-tracking branch 'origin/master' into issue838_enforece_limited_queue

Author: soxofaan

CHANGELOG.md

@@ -16,7 +16,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Internal reorganization of `openeo.extra.job_management` submodule to ease future development ([#741](https://github.com/Open-EO/openeo-python-client/issues/741))
 - `openeo.Connection`: add some more HTTP error codes to the default retry list: `502 Bad Gateway`, `503 Service Unavailable` and `504 Gateway Timeout` ([#835](https://github.com/Open-EO/openeo-python-client/issues/835))
-- `MultiBackendJobManager`: don't count "created" jobs as "running"
 
 ### Removed
 

openeo/extra/job_management/_manager.py

@@ -545,7 +545,9 @@ def _job_update_loop(
         not_started = job_db.get_by_status(statuses=["not_started"], max=200).copy()
         if len(not_started) > 0:
             # Check number of jobs queued/running at each backend
-            running = job_db.get_by_status(statuses=["queued", "queued_for_start", "running"])
+            # TODO: should "created" be included in here? Calling this "running" is quite misleading then.
+            #       apparently (see #839/#840) this seemingly simple change makes a lot of MultiBackendJobManager tests flaky
+            running = job_db.get_by_status(statuses=["created", "queued", "queued_for_start", "running"])
             queued = running[running["status"] == "queued"]
             running_per_backend = running.groupby("backend_name").size().to_dict()
             queued_per_backend = queued.groupby("backend_name").size().to_dict()

tests/extra/job_management/test_manager.py

@@ -281,15 +281,7 @@ def test_start_job_thread_basic(self, tmp_path, job_manager, job_manager_root_di
             ("job-2019", "finished", "foo", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
             ("job-2020", "finished", "bar", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
             ("job-2021", "finished", "bar", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
-            (
-                "job-2022",
-                "finished",
-                dirty_equals.IsOneOf("foo", "bar"),
-                "1234.5 cpu-seconds",
-                "34567.89 mb-seconds",
-                "2345 seconds",
-                123,
-            ),
+            ("job-2022", "finished", "foo", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
         ]
 
         # Check downloaded results and metadata.