Skip to content

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srchilukoori@VladaZakharova@shahar1@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add system tests for Dataproc trigger on_kill cancel behavior by srchilukoori · Pull Request #65982 · apache/airflow · GitHub
Skip to content

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srchilukoori@VladaZakharova@shahar1@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add system tests for Dataproc trigger on_kill cancel behavior by srchilukoori · Pull Request #65982 · apache/airflow · GitHub
Skip to content

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srchilukoori@VladaZakharova@shahar1@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add system tests for Dataproc trigger on_kill cancel behavior by srchilukoori · Pull Request #65982 · apache/airflow · GitHub
Skip to content

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srchilukoori@VladaZakharova@shahar1@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add system tests for Dataproc trigger on_kill cancel behavior by srchilukoori · Pull Request #65982 · apache/airflow · GitHub
Skip to content

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Add system tests for Dataproc trigger on_kill cancel behavior - #65982

Merged
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests
May 10, 2026
Merged

Add system tests for Dataproc trigger on_kill cancel behavior#65982
potiuk merged 7 commits into
apache:mainfrom
srchilukoori:test/dataproc-trigger-on-kill-system-tests

Conversation

@srchilukoori

@srchilukoorisrchilukoori commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #65742 as requested by @shahar1. Adds a system test DAG that exercises the cancel_on_kill behavior introduced when DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated to BaseTrigger.on_kill().

Changes:

New file: providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py

The DAG contains two tests sharing a single Dataproc cluster:

TestWhat it doesWhat it proves
A (happy path)Deferrable submit with cancel_on_kill=True runs SparkPi to completionTrigger plumbing with cancel_on_kill=True does not break normal deferrable execution
B (cancel path)Submits a long-running SparkPi (1M slices) asynchronously, cancels it via DataprocHook.cancel_job(), asserts CANCELLED stateThe cancel_job() call that on_kill() delegates to actually cancels running Dataproc jobs

Testing:

System tests require GCP credentials and a project with Dataproc API enabled. I do not have access to a GCP environment to run this test end-to-end. The test was verified via:

  • python3 -m py_compile — syntax OK
  • ruff check / ruff format — all checks passed
  • All pre-commit hooks passed
  • Pattern consistency verified against existing Dataproc system tests (example_dataproc_spark_deferrable.py, example_dataproc_spark_async.py, example_dataproc_start_from_trigger.py)

To run manually:

SYSTEM_TESTS_ENV_ID=<id> SYSTEM_TESTS_GCP_PROJECT=<project> \
pytest providers/google/tests/system/google/cloud/dataproc/example_dataproc_cancel_on_kill.py -s

related: #65742


Was generative AI tooling used to co-author this PR?
  • Yes — Claude

@boring-cyborgboring-cyborgBot added area:providers provider:google Google (including GCP) related issues labels Apr 27, 2026
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from a99a3c6 to f13986dCompareApril 28, 2026 00:51

@shahar1shahar1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great, thank you!

@VladaZakharova@MaksYermak - is it compatible for running on your environment? I'll be happy for your feedback.

@VladaZakharova

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

@shahar1

Copy link
Copy Markdown
Contributor

hi
thank you for submitting PR.
In google provider we don't actually create a system test for every parameter we have, because then google provider will blow because of it's own size :)
I can see that you created this PR to test changes from another PR. I think in this case only good unit tests will be enough.

Is it possible to retain it, but exclude from the Google automated tests?

srchilukoori pushed a commit to srchilukoori/airflow that referenced this pull request Apr 29, 2026
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

@shahar1

Copy link
Copy Markdown
Contributor

Thanks @shahar1, made the change.

Added an env-var gate at module level in example_dataproc_cancel_on_kill.py:

ifnotos.environ.get("RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST"):
pytest.skip("Manual-only system test: set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 to run.", allow_module_level=True)

How this works: by default the test is skipped at collection time, so automated runs (which don't set the env var) won't pick it up. To run manually, set RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1. Same pytest.skip(..., allow_module_level=True) pattern already used for "service not available" gates in example_bigquery_to_mysql.py etc.

Verified locally with pytest --collect-only --system:

  • without the env var: 0 tests collected (SKIPPED with the explanation message)
  • with RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1: 1 test collected

Nice idea, but currently seems incompatible with other tests, as they fail - try to figure out how to work around that.

@srchilukoori

srchilukoori commented Apr 29, 2026

Copy link
Copy Markdown
ContributorAuthor

Fixed in 678492e. Replaced pytest.skip(allow_module_level=True) with pytestmark = pytest.mark.skipif(...) — file imports cleanly now, test still skipped unless RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set.

cc: @VladaZakharova

Sadha Chilukoori added 4 commits May 2, 2026 11:56
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
@srchilukoori
srchilukooriforce-pushed the test/dataproc-trigger-on-kill-system-tests branch from 678492e to 649d397CompareMay 2, 2026 18:56
@potiuk

Copy link
Copy Markdown
Member

@srchilukoori — Your unresolved review thread(s) from @shahar1 appear to have been addressed (post-review commits and/or in-thread replies on every thread, with the latest commit pushed after the most recent thread). I've added the ready for maintainer review label so the PR re-enters the maintainer review queue.

@shahar1 — could you take another look when you have a chance? If you agree the feedback was addressed, please mark the threads as resolved so the queue signal stays accurate. If a thread still needs work, please reply in-line — @srchilukoori will follow up.


Note: This comment was drafted by an AI-assisted triage tool and may contain mistakes. Once you have addressed the points above, an Apache Airflow maintainer — a real person — will take the next look at your PR. We use this two-stage triage process so that our maintainers' limited time is spent where it matters most: the conversation with you.

@potiukpotiuk added the ready for maintainer review Set after triaging when all criteria pass. label May 5, 2026
@shahar1

Copy link
Copy Markdown
Contributor

Merged from main, good to merge after CI is green

@srchilukoori

Copy link
Copy Markdown
ContributorAuthor

Merged from main, good to merge after CI is green

@shahar1 all checks are green. Please merge when you get a minute.

@potiuk
potiuk merged commit f38982c into apache:mainMay 10, 2026
94 checks passed
jason810496 pushed a commit to jason810496/airflow that referenced this pull request May 11, 2026
…#65982)
* Add system tests for Dataproc trigger on_kill cancel behavior
Follow-up to apache#65742 (requested by @shahar1). Adds a system test DAG
that exercises the cancel_on_kill plumbing introduced when
DataprocSubmitTrigger and DataprocSubmitJobDirectTrigger migrated
to BaseTrigger.on_kill().
Test A: deferrable submit with cancel_on_kill=True completes normally.
Test B: submits a long-running job, cancels it via DataprocHook.cancel_job()
(the same call on_kill delegates to), and asserts CANCELLED state.
* Fix MyPy failure: use version-compat import pattern for task decorator
The bare `from airflow.decorators import task` import fails MyPy in
the providers check because `airflow.decorators` does not export `task`
in Airflow 3.x. Switch to the standard `AIRFLOW_V_3_0_PLUS` conditional
import pattern used by all other system tests.
* Gate cancel_on_kill system test behind opt-in env var
Per reviewer feedback (apache#65982), exclude the cancel_on_kill system test
from automated Google CI runs. Test now skips at collection time unless
RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST=1 is set, allowing manual
end-to-end runs without burdening automated infrastructure.
* Replace module-level pytest.skip with pytestmark skipif
pytest.skip(allow_module_level=True) raises a Skipped exception at
import time that DagBag records as an import error, breaking the
test_should_be_importable parametrized test in DB-core CI jobs.
pytestmark = pytest.mark.skipif(...) lets the file import cleanly
(DagBag happy, importability test passes) while still skipping
test_run when RUN_MANUAL_DATAPROC_CANCEL_ON_KILL_TEST is unset.
* Rename env flag to RUN_MANUAL_GOOGLE_SYSTEM_TESTS for generalization
---------
Co-authored-by: Sadha Chilukoori <ssreddy.8555@gmail.com>
Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
@srchilukoori
srchilukoori deleted the test/dataproc-trigger-on-kill-system-tests branch May 11, 2026 13:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providersprovider:googleGoogle (including GCP) related issuesready for maintainer reviewSet after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srchilukoori@VladaZakharova@shahar1@potiuk