Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek
, '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

Added retry to ECS Operator - #14263

Merged
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry
Mar 26, 2021
Merged

Added retry to ECS Operator#14263
ashb merged 14 commits into
apache:masterfrom
markhopson:ecs-quota-retry

Conversation

@markhopson

@markhopsonmarkhopson commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

This PR allows users to enable retry-behaviour for ECSOperator._start_task.

This feature was discussed briefly: here #13725

The design was lifted from hooks/base_google.py. There's 2 main differences with my AWS implementation ...

  1. the user can configure the retry with a param quota_retry (Dict) that is passed in to the ECSOperator

  2. the user can configure the retry without tenacity (e.g. passing in max=300 and multiplier=1 instead of tenacity.wait_exponential(multiplier=1, max=300)

@boring-cyborgboring-cyborgBot added area:webserver Webserver related Issues provider:amazon AWS/Amazon - related issues labels Feb 16, 2021
@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/master/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, pylint 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

Comment threadairflow/www/yarn-error.log Outdated
@turbaszek
turbaszek removed the request for review from ryanahamiltonFebruary 16, 2021 22:03
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek Thanks for the feedback. I also saw some checks fail (i.e. CI Build / Postgres9.6,Py3.6, CI Build / MySQL5.7, Py3.6, CI Build / Sqlite Py3.6) but I'm not sure what to do to fix them. Can you please advise me? Thanks!

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@turbaszek just a friendly bump to see what the next steps are here

from airflow.providers.amazon.aws.models.exceptions import ECSOperatorError
from airflow.utils.log.logging_mixin import LoggingMixin

ECS_QUOTA_ERROR_REASONS = [

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.

Since these are ECS specific they shouldn't really be in the base_aws module.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Not sure what to do here. It feels weird to move this to ecs.py if I have code in base_aws.py that catches ECSOperatorError. For now, I've moved this variable into the is_permissible_error() scope to clarify intent. Any suggestions are welcomed.

Comment threadairflow/providers/amazon/aws/operators/ecs.py Outdated
Comment threadairflow/providers/amazon/aws/operators/ecs.py
Comment threadairflow/providers/amazon/aws/hooks/base_aws.py Outdated
"""

def decorator_f(self):
quota_retry = getattr(self, 'quota_retry', None)

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.

Not sure about this parameter name -- it seems very specific to EcsOperator only.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point. Hm I've changed it to retry_args to be more generic, but I'm open to any suggestions.

Comment threadairflow/providers/amazon/aws/models/exceptions.py Outdated
@markhopson
markhopson requested a review from ashbFebruary 28, 2021 04:01
@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump here

@ashb

ashb commented Mar 6, 2021

Copy link
Copy Markdown
Member

Thanks, I'll take a look on Monday

return self.get_client_type("iam").get_role(RoleName=role)["Role"]["Arn"]

@staticmethod
def retry(fun: Callable):

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.

If we change this to

defretry(should_retry: Callable[[Exception], bool], fun: Callable)

Then the retry_if_permissible_error can move out of BaseAWS in to ECSHook, used like this:

defshould_retry(exception: Exception):
"""Check if exception is related to ECS resource quota (CPU, MEM)."""returnisinstance(exception, ECSOperatorError) andany(
quota_reasoninfailure['reason']
forquota_reasonin ['RESOURCE:MEMORY', 'RESOURCE:CPU']
forfailureinexception.failures
)
...
@AwsBaseHook.retry(should_retry)def_start_task(self):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wish I thought of this. I've made this change.

limit.
"""

def decorator_f(self):

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.

Suggested change
defdecorator_f(self):
@functools.wraps
defdecorator_f(self, *args, **kwargs):

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@ashb

ashb commented Mar 8, 2021

Copy link
Copy Markdown
Member

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@markhopson See the review I just left -- I think that gives us a way to have the base retry functionality in the base hook, without having to put any service specific login in there. WDYT?

@ashb Good tip. I like it. I've made the change.

@markhopson
markhopson requested a review from ashbMarch 10, 2021 02:56
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@markhopson

Copy link
Copy Markdown
ContributorAuthor

@ashb Friendly bump.

@ashbashb 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.

Code looks good @markhopson

Could you fix up the static checks please?

@github-actionsgithub-actionsBot added the okay to merge It's ok to merge this PR as it does not require more tests label Mar 19, 2021
@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 master or amend the last commit of the PR, and push it with --force-with-lease.

@ashb

ashb commented Mar 19, 2021

Copy link
Copy Markdown
Member

TestECSOperator.test_execute_with_failures is now failing becuase the type of the exception it throws has changed -- I think that's fine, and the tests just need updating.

I haven't look in detail at the code/test though.

@ashb
ashb merged commit 614be87 into apache:masterMar 26, 2021
@boring-cyborg

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request!

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

Labels

area:webserverWebserver related Issuesokay to mergeIt's ok to merge this PR as it does not require more testsprovider:amazonAWS/Amazon - related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@markhopson@ashb@turbaszek