Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator - #22955

Merged
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout
Apr 14, 2022
Merged

Fix cancel_on_kill after execution timeout for DataprocSubmitJobOperator#22955
potiuk merged 1 commit into
apache:mainfrom
tauzen:fix-dataproc-submit-cancel-on-timeout

Conversation

@tauzen

Copy link
Copy Markdown
Contributor

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.

@tauzen
tauzen requested a review from turbaszek as a code ownerApril 12, 2022 17:12
@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 12, 2022
@boring-cyborg

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@github-actions

Copy link
Copy Markdown
Contributor

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Apr 12, 2022

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@potiuk

Copy link
Copy Markdown
Member

Static checks need fixing

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before 🤔. Will try to fix this.

@potiuk

Copy link
Copy Markdown
Member

Thanks @potiuk! That's odd that mypy is complaining about this now, and wasn't before thinking. Will try to fix this.

Mypy does seem to work a bit "unstable'y" - I think I know why and might be we will soon fix it.

@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 3962a73 to 1818ff1CompareApril 13, 2022 10:49
@tauzen

Copy link
Copy Markdown
ContributorAuthor

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

@potiuk

potiuk commented Apr 13, 2022

Copy link
Copy Markdown
Member

It's a bit sad that we need to have this additional job_id variable to keep mypy happy, it might be confusing for future contributors. Do you want me to add some additional comment about this in the code? On the bright side - fewer line changes in this PR.

I don't find it wrong. It's not to keep mypy happy, it's to make sure you don't accidentally use None. There is nothing wrong with the way you've done and it needs no explanation

I think in this case mypy gave you hint on how to make your code more redable and less error prone.

Contraray to popular belief peeople should optimise their code for easines of reading and correctness not to "avoid" creating variables. Compileres and interpreters will optimise it away and creating extra, properly named variable is often much better solution than .. adding a comment about it.

I often do that. In this case maybe even name it "new_job_id" and even expilcitly mark it as : str -> that will be the best "explanation" of what it is for and why it's there. And there will be no need for comment.

Comments are overrated on the other hand.

@tauzen

tauzen commented Apr 13, 2022

Copy link
Copy Markdown
ContributorAuthor

Comments are overrated on the other hand.

Definitely 👍

Could you please clarify if you are ok with the current PR, or do you prefer to s/job_id/new_job_id and add :str to the definition of new_job_id. Either way is ok with me.

@potiuk

Copy link
Copy Markdown
Member

Add it - you will see that it's going to be cleaner. And then you can even move self.job_id = new_job_id closer to the end of the function - and separate variabe will suddenly make a lot more sense

Synchronous tasks killed by execution timeout weren't canceled
due to wrong assignment of job_id property.
@tauzen
tauzenforce-pushed the fix-dataproc-submit-cancel-on-timeout branch from 1818ff1 to 79ac6f8CompareApril 13, 2022 12:33
@tauzen

Copy link
Copy Markdown
ContributorAuthor

Thanks for the guidance @potiuk! 🙇 Ok, so this PR is approved and labeled with okay to merge, tests are green - can I assume it will be merged at your convenience?

@potiuk
potiuk merged commit ea1ae19 into apache:mainApr 14, 2022
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

@potiuk

Copy link
Copy Markdown
Member

Done :)

@tauzen

Copy link
Copy Markdown
ContributorAuthor

Awesome, thank you very much @potiuk 😄

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersokay to mergeIt's ok to merge this PR as it does not require more testsprovider:googleGoogle (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tauzen@potiuk@uranusjr