mhenc commented on code in PR #26509:
URL: https://github.com/apache/airflow/pull/26509#discussion_r978377313
##########
airflow/models/dag.py:
##########
@@ -1189,11 +1195,25 @@ def relative_fileloc(self) -> pathlib.Path:
"""File location of the importable dag 'file' relative to the
configured DAGs folder."""
path = pathlib.Path(self.fileloc)
try:
- return path.relative_to(settings.DAGS_FOLDER)
+ rel_path = path.relative_to(self.dag_processor_dags_folder or
settings.DAGS_FOLDER)
+ if rel_path == pathlib.Path('.'):
+ return path
+ else:
+ return rel_path
except ValueError:
# Not relative to DAGS_FOLDER.
return path
+ @property
+ def dag_processor_dags_folder(self):
Review Comment:
I see that name may be a little confusing, but `--subdir` just points to the
dag folder - the value can be absolute path and two different processors may
point ot complete different locations.
So what you wrote above:
> Actually... i think processor_subdir is something different. I think that
the idea is you can have multiple dag processors running, each looking at a
different subdir, which is a subdir of dags_folder. that sound right to you?
is actually not true
Also
> it does seem a bit weird though because then maybe if you change the dags
processor subdirs later, perhaps some of those dags would never be returned by
this query and therefore would never be deactivated?
For that we have a new check in the scheduler:
https://github.com/apache/airflow/blob/main/airflow/jobs/scheduler_job.py#L1541
--
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]
