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-6397] ensure sub_process attribute exists before trying to kill #6958

Merged

Conversation

dstandish
Copy link
Contributor

@dstandish dstandish commented Dec 29, 2019

in bash operator, sub_process attribute is not created in __init__

and if on_kill is called before sub_process is created, we'll get an exception

this was causing flakey failures in the jobs test test_mark_success_no_kill

this change creates attribute in init, and in on_kill, checks that it has been assigned a value before trying to kill

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-6397
    • 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:

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

  • 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

@dstandish dstandish changed the title [AIRFLOW-6397] ensure sub_process attribute exists before trying to kil [AIRFLOW-6397] ensure sub_process attribute exists before trying to kill Dec 29, 2019
@codecov-io
Copy link

codecov-io commented Dec 30, 2019

Codecov Report

Merging #6958 into master will decrease coverage by 0.28%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6958      +/-   ##
==========================================
- Coverage    84.7%   84.41%   -0.29%     
==========================================
  Files         679      679              
  Lines       38488    38489       +1     
==========================================
- Hits        32600    32491     -109     
- Misses       5888     5998     +110
Impacted Files Coverage Δ
airflow/operators/bash_operator.py 90.74% <100%> (+0.17%) ⬆️
airflow/kubernetes/volume_mount.py 44.44% <0%> (-55.56%) ⬇️
airflow/kubernetes/volume.py 52.94% <0%> (-47.06%) ⬇️
airflow/kubernetes/pod_launcher.py 45.25% <0%> (-46.72%) ⬇️
airflow/kubernetes/refresh_config.py 50.98% <0%> (-23.53%) ⬇️
...rflow/contrib/operators/kubernetes_pod_operator.py 78.75% <0%> (-20%) ⬇️

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 5e100ab...2ab8d23. Read the comment docs.

@potiuk potiuk merged commit 0f7c456 into apache:master Dec 30, 2019
@dstandish dstandish deleted the fix-bash-operator-subprocess-on-kill branch December 30, 2019 06:41
potiuk pushed a commit that referenced this pull request Dec 30, 2019
potiuk pushed a commit that referenced this pull request Jan 21, 2020
galuszkak pushed a commit to FlyrInc/apache-airflow that referenced this pull request Mar 5, 2020
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