From f30e0bc3c2fd6fa4e04113095178241527ad994b Mon Sep 17 00:00:00 2001 From: Jan Van den bosch Date: Thu, 26 Jan 2023 07:25:19 +0100 Subject: [PATCH] fix jobName, state and status values #272 POST https://etl-dev.terrascope.be/resources {'jobId': 'j-220b5d02390e412386c93508badb7074', 'jobName': None, 'executionId': 'application_1674538064532_9722', 'userId': 'jenkins', 'sourceId': 'TerraScope/MEP', 'orchestrator': 'openeo', 'jobStart': 1674682122903.0, 'jobFinish': 1674682639861.0, 'state': 'SUCCEEDED', 'status': 'finished', 'metrics': {'cpu': {'value': 2480, 'unit': 'cpu-seconds'}, 'memory': {'value': 4020798, 'unit': 'mb-seconds'}, 'time': {'value': 516958.0, 'unit': 'milliseconds'}, 'processing': {'value': 0.0, 'unit': 'shpu'}}} returned 400: {"status":400,"message":"Bad Request Exception","timestamp":"2023-01-25T21:38:55.734Z","path":"/resources"} --- openeogeotrellis/job_tracker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openeogeotrellis/job_tracker.py b/openeogeotrellis/job_tracker.py index 0c3e2c80e..635974e9a 100644 --- a/openeogeotrellis/job_tracker.py +++ b/openeogeotrellis/job_tracker.py @@ -185,7 +185,7 @@ def update_statuses(self) -> None: sentinelhub_batch_processing_units = (ZkJobRegistry.get_dependency_usage(job_info) or Decimal("0.0")) - job_title = result_metadata.get("title") + job_title = job_info.get("title") with EtlApi(ConfigParams().etl_api) as etl_api: resource_costs_in_credits = etl_api.log_resource_usage( @@ -195,8 +195,8 @@ def update_statuses(self) -> None: user_id=user_id, started_ms=float(start_time), finished_ms=float(finish_time), - state=final_state, - status=new_status, + state=state, + status=final_state, cpu_seconds=cpu_time_seconds, mb_seconds=memory_time_megabyte_seconds, duration_ms=float(finish_time) - float(start_time),