Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading
, '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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""
Example Airflow DAG that tests cancel_on_kill behavior for Dataproc triggers.

Test A (happy path): Submits a Spark job in deferrable mode with cancel_on_kill=True
and verifies it completes successfully.

Test B (cancel path): Submits a long-running Spark job asynchronously, cancels it
via DataprocHook.cancel_job() — the same call that trigger.on_kill() delegates to —
and verifies the job reaches CANCELLED state.
"""

from __future__ import annotations

import os
import time
from datetime import datetime

import pytest
from google.api_core.retry import Retry
from google.cloud.dataproc_v1 import JobStatus

from airflow.models.dag import DAG
from airflow.providers.google.cloud.hooks.dataproc import DataprocHook
from airflow.providers.google.cloud.operators.dataproc import (
DataprocCreateClusterOperator,
DataprocDeleteClusterOperator,
DataprocSubmitJobOperator,
)

from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import TriggerRule, task
else:
from airflow.decorators import task # type: ignore[attr-defined,no-redef]
from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined]

pytestmark = pytest.mark.skipif(
not os.environ.get("RUN_MANUAL_GOOGLE_SYSTEM_TESTS"),
reason="Manual-only system test: set RUN_MANUAL_GOOGLE_SYSTEM_TESTS=1 to run.",
)

ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")
DAG_ID = "dataproc_cancel_on_kill"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID

CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL

REGION = "europe-west1"

CLUSTER_CONFIG = {
"master_config": {
"num_instances": 1,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
"worker_config": {
"num_instances": 2,
"machine_type_uri": "n1-standard-4",
"disk_config": {"boot_disk_type": "pd-standard", "boot_disk_size_gb": 32},
},
}

SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
},
}

# [START how_to_cloud_dataproc_cancel_on_kill_config]
LONG_RUNNING_SPARK_JOB = {
"reference": {"project_id": PROJECT_ID},
"placement": {"cluster_name": CLUSTER_NAME},
"spark_job": {
"jar_file_uris": ["file:///usr/lib/spark/examples/jars/spark-examples.jar"],
"main_class": "org.apache.spark.examples.SparkPi",
"args": ["1000000"],
},
}
# [END how_to_cloud_dataproc_cancel_on_kill_config]


with DAG(
DAG_ID,
schedule="@once",
start_date=datetime(2021, 1, 1),
catchup=False,
tags=["example", "dataproc", "cancel_on_kill", "deferrable"],
) as dag:
create_cluster = DataprocCreateClusterOperator(
task_id="create_cluster",
project_id=PROJECT_ID,
cluster_config=CLUSTER_CONFIG,
region=REGION,
cluster_name=CLUSTER_NAME,
retry=Retry(maximum=100.0, initial=10.0, multiplier=1.0),
num_retries_if_resource_is_not_ready=3,
)

# Test A: deferrable submit with cancel_on_kill=True completes normally
# [START how_to_cloud_dataproc_deferrable_cancel_on_kill]
spark_task_deferrable = DataprocSubmitJobOperator(
task_id="spark_task_deferrable",
job=SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
deferrable=True,
cancel_on_kill=True,
)
# [END how_to_cloud_dataproc_deferrable_cancel_on_kill]

# Test B: submit a long-running job, cancel it, verify CANCELLED state
submit_long_job = DataprocSubmitJobOperator(
task_id="submit_long_job",
job=LONG_RUNNING_SPARK_JOB,
region=REGION,
project_id=PROJECT_ID,
asynchronous=True,
)

@task(task_id="cancel_and_verify")
def cancel_and_verify_job(job_id: str, project_id: str, region: str):
"""Cancel a running Dataproc job and verify it reaches CANCELLED state.

Exercises the same DataprocHook.cancel_job() call that
DataprocSubmitTrigger.on_kill() and DataprocSubmitJobDirectTrigger.on_kill()
delegate to.
"""
hook = DataprocHook(gcp_conn_id="google_cloud_default")

hook.cancel_job(job_id=job_id, project_id=project_id, region=region)

for _ in range(30):
job = hook.get_job(job_id=job_id, project_id=project_id, region=region)
state = job.status.state
if state in (JobStatus.State.DONE, JobStatus.State.CANCELLED, JobStatus.State.ERROR):
break
time.sleep(5)
else:
raise RuntimeError(f"Job {job_id} did not reach terminal state within 150s")

assert job.status.state == JobStatus.State.CANCELLED, (
f"Expected CANCELLED, got {JobStatus.State(job.status.state).name}"
)

cancel_task = cancel_and_verify_job(
job_id=submit_long_job.output,
project_id=PROJECT_ID,
region=REGION,
)

delete_cluster = DataprocDeleteClusterOperator(
task_id="delete_cluster",
project_id=PROJECT_ID,
cluster_name=CLUSTER_NAME,
region=REGION,
trigger_rule=TriggerRule.ALL_DONE,
)

(
# TEST SETUP
create_cluster
# TEST BODY
>> spark_task_deferrable
>> submit_long_job
>> cancel_task
# TEST TEARDOWN
>> delete_cluster
)

from tests_common.test_utils.watcher import watcher

list(dag.tasks) >> watcher()


from tests_common.test_utils.system_tests import get_test_run # noqa: E402

test_run = get_test_run(dag)
Loading