Skip to content

Add delete inactive run functionality to databricks provider #30646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 3 commits into from
Apr 14, 2023
Merged

Add delete inactive run functionality to databricks provider #30646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
289d38c
Add delete run endpoint
phanikumv Apr 14, 2023
e0ea108
Add tests
phanikumv Apr 14, 2023
f96c200
fixup
phanikumv Apr 14, 2023
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
10 changes: 10 additions & 0 deletions airflow/providers/databricks/hooks/databricks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
SUBMIT_RUN_ENDPOINT = ("POST", "api/2.1/jobs/runs/submit")
GET_RUN_ENDPOINT = ("GET", "api/2.1/jobs/runs/get")
CANCEL_RUN_ENDPOINT = ("POST", "api/2.1/jobs/runs/cancel")
DELETE_RUN_ENDPOINT = ("POST", "api/2.1/jobs/runs/delete")
OUTPUT_RUNS_JOB_ENDPOINT = ("GET", "api/2.1/jobs/runs/get-output")

INSTALL_LIBS_ENDPOINT = ("POST", "api/2.0/libraries/install")
Expand Down Expand Up @@ -351,6 +352,15 @@ def cancel_run(self, run_id: int) -> None:
json = {"run_id": run_id}
self._do_api_call(CANCEL_RUN_ENDPOINT, json)

def delete_run(self, run_id: int) -> None:
"""
Deletes a non-active run.

:param run_id: id of the run
"""
json = {"run_id": run_id}
self._do_api_call(DELETE_RUN_ENDPOINT, json)

def restart_cluster(self, json: dict) -> None:
"""
Restarts the cluster.
Expand Down
22 changes: 22 additions & 0 deletions tests/providers/databricks/hooks/test_databricks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ def cancel_run_endpoint(host):
return f"https://{host}/api/2.1/jobs/runs/cancel"


def delete_run_endpoint(host):
"""
Utility function to generate delete run endpoint given the host.
"""
return f"https://{host}/api/2.1/jobs/runs/delete"


def start_cluster_endpoint(host):
"""
Utility function to generate the get run endpoint given the host.
Expand Down Expand Up @@ -521,6 +528,21 @@ def test_cancel_run(self, mock_requests):
timeout=self.hook.timeout_seconds,
)

@mock.patch("airflow.providers.databricks.hooks.databricks_base.requests")
def test_delete_run(self, mock_requests):
mock_requests.post.return_value.json.return_value = {}

self.hook.delete_run(RUN_ID)

mock_requests.post.assert_called_once_with(
delete_run_endpoint(HOST),
json={"run_id": RUN_ID},
params=None,
auth=HTTPBasicAuth(LOGIN, PASSWORD),
headers=self.hook.user_agent_header,
timeout=self.hook.timeout_seconds,
)

@mock.patch("airflow.providers.databricks.hooks.databricks_base.requests")
def test_start_cluster(self, mock_requests):
mock_requests.codes.ok = 200
Expand Down