diff --git a/servicex_app/servicex_app/lookup_result_processor.py b/servicex_app/servicex_app/lookup_result_processor.py index 19ef39b6a..c2047d122 100644 --- a/servicex_app/servicex_app/lookup_result_processor.py +++ b/servicex_app/servicex_app/lookup_result_processor.py @@ -42,6 +42,11 @@ def celery_task_name(request_id): def add_files_to_processing_queue(self, request, files=None): if files is None: files = request.all_files + if request.status.is_complete: + current_app.logger.debug("Rejecting file addition request, request is canceled", + extra={ + "task_id": self.celery_task_name(request.request_id)}) + return for file_record in files: self.celery.send_task("transformer_sidecar.transform_file", kwargs={ diff --git a/servicex_app/servicex_app/resources/transformation/cancel.py b/servicex_app/servicex_app/resources/transformation/cancel.py index b05533e0f..4e30a60f5 100644 --- a/servicex_app/servicex_app/resources/transformation/cancel.py +++ b/servicex_app/servicex_app/resources/transformation/cancel.py @@ -55,7 +55,7 @@ def get(self, request_id: str): namespace = current_app.config['TRANSFORMER_NAMESPACE'] - if transform_req.status == TransformStatus.running: + if transform_req.status in (TransformStatus.running, TransformStatus.lookup): try: self.transformer_manager.shutdown_transformer_job(request_id, namespace) except kubernetes.client.exceptions.ApiException as exc: diff --git a/servicex_app/servicex_app/templates/requests_table.html b/servicex_app/servicex_app/templates/requests_table.html index 15b4cf743..049384c61 100644 --- a/servicex_app/servicex_app/templates/requests_table.html +++ b/servicex_app/servicex_app/templates/requests_table.html @@ -63,7 +63,7 @@