ashb commented on code in PR #25935: URL: https://github.com/apache/airflow/pull/25935#discussion_r955922689
########## airflow/dag_processing/dag_directory/dag_directory.py: ########## @@ -0,0 +1,41 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from pathlib import Path +from typing import Optional, Union + + +class DagProcessorDirectory: + """Stores information about the dag directory used by the dag processor. + + Note that the value is available only for DagProcessorManager process. + Any other user should read this value from e.g. DagModel.dag_directory field. + """ + + _dag_directory: Optional[str] = None + + @staticmethod + def get_dag_directory() -> Optional[str]: + return DagProcessorDirectory._dag_directory + + @staticmethod + def set_dag_directory(value: Union[str, Path]): + if value is Path: + DagProcessorDirectory._dag_directory = str(Path(value).resolve()) + else: + DagProcessorDirectory._dag_directory = str(value) Review Comment: Please find a way of doing this that doesn't involve two new files and a class - we're not JavaWhereEverythingIsAClass. ########## airflow/dag_processing/manager.py: ########## @@ -663,6 +675,12 @@ def _fetch_callbacks(self, max_callbacks: int, session: Session = NEW_SESSION): with prohibit_commit(session) as guard: query = ( session.query(DbCallbackRequest) + .filter( + or_( + DbCallbackRequest.dag_directory == DagProcessorDirectory.get_dag_directory(), + not self.standalone_dag_processor, Review Comment: This results in `dag_directory = ? OR true` (or `OR false`) which seems sub-optimal/un-necessary. Why not just set dag_directory for all modes? ########## airflow/jobs/scheduler_job.py: ########## @@ -1476,9 +1488,35 @@ def _find_zombies(self, session: Session) -> None: for ti, file_loc in zombies: request = TaskCallbackRequest( full_filepath=file_loc, + dag_directory=ti.dag_model.dag_directory, simple_task_instance=SimpleTaskInstance.from_ti(ti), msg=f"Detected {ti} as zombie", ) self.log.error("Detected zombie job: %s", request) self.executor.send_callback(request) Stats.incr('zombies_killed') + + @provide_session + def _cleanup_stale_dags(self, session: Session) -> None: + """ + Find all dags that were not updated by Dag Processor in last 10 minutes and mark them as inactive. Review Comment: Timeout should be configurable. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
