Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AIRFLOW-4248] Fix 'FileExistsError' makedirs() race condition #5047

Merged
merged 1 commit into from
Apr 5, 2019

Conversation

kppullin
Copy link
Contributor

@kppullin kppullin commented Apr 5, 2019

Make sure you have checked all steps below.

Jira

  • My PR addresses the following Airflow Jira issues and references them in the PR title. For example, "[AIRFLOW-XXX] My Airflow PR"
    • https://issues.apache.org/jira/browse/AIRFLOW-4248
    • In case you are fixing a typo in the documentation you can prepend your commit with [AIRFLOW-XXX], code changes always need a Jira issue.
    • In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal (AIP).
    • In case you are adding a dependency, check if the license complies with the ASF 3rd Party License Policy.

Description

  • Here are some details about my PR, including screenshots of any UI changes:

The FileProcessorHandler's _init_file method can trigger an unhandled exception due to a race condition when multiple processes attempt to create the same directory on a shared filesystem. When this occurs a FileExistsError is raised, and if it is the scheduler process, can prevent tasks from starting until the scheduler is restarted.

This PR catches the exception and handles it similarly to how it's done when using the exists_ok=True argument of Python v3.2's os.makedirs function , which does an isdir() call instead of checking for the EEXIST error code (comments in os.makedirs state that checking for this error code is unreliable because the OS can return other error codes instead). This PR also replaces the existing EEXIST check in the FileProcessorHandler.__init__ method to instead use isdir().

Note: It'd be slightly nicer to just use the os.makdirs(exists_ok=True) parameter instead, which can be done if this PR becomes dependent upon AIP-3.

Tests

  • [] My PR adds the following unit tests OR does not need testing for this extremely good reason:

Commits

  • My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Documentation

  • [N/A] In case of new functionality, my PR adds documentation that describes how to use it.
    • All the public functions and the classes in the PR contain docstrings that explain what it does
    • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

Code Quality

  • Passes flake8

@codecov-io
Copy link

Codecov Report

Merging #5047 into master will decrease coverage by <.01%.
The diff coverage is 28.57%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5047      +/-   ##
==========================================
- Coverage   76.23%   76.22%   -0.01%     
==========================================
  Files         466      466              
  Lines       30101    30104       +3     
==========================================
  Hits        22948    22948              
- Misses       7153     7156       +3
Impacted Files Coverage Δ
airflow/utils/log/file_processor_handler.py 82.66% <28.57%> (-3.45%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4991c34...edd76d6. Read the comment docs.

@ashb ashb merged commit 8195ea9 into apache:master Apr 5, 2019
ashb pushed a commit that referenced this pull request Apr 5, 2019
cthenderson pushed a commit to cthenderson/apache-airflow that referenced this pull request Apr 16, 2019
andriisoldatenko pushed a commit to andriisoldatenko/airflow that referenced this pull request Jul 26, 2019
wmorris75 pushed a commit to modmed/incubator-airflow that referenced this pull request Jul 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants