Skip to content

Fix successful Apache Druid task submissions reported as failed #36813

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 6 commits into from
Jan 24, 2024
Merged

Fix successful Apache Druid task submissions reported as failed #36813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
298d19e
Accept 202 status code response
listik Jan 16, 2024
f460b44
Fix status message
listik Jan 16, 2024
64b5075
Addresses [comment](https://github.com/apache/airflow/pull/36813#disc…
listik Jan 17, 2024
2c52431
Merge branch 'main' into apacheDruidSuccessCode
listik Jan 17, 2024
a203c24
Make tests cover actual behaviour
listik Jan 22, 2024
87ff6e3
Merge branch 'main' into apacheDruidSuccessCode
listik Jan 22, 2024
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
5 changes: 3 additions & 2 deletions airflow/providers/apache/druid/hooks/druid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ def submit_indexing_job(
req_index = requests.post(url, data=json_index_spec, headers=self.header, auth=self.get_auth())

code = req_index.status_code
if code != 200:
not_accepted = not (200 <= code < 300)
if not_accepted:
self.log.error("Error submitting the Druid job to %s (%s) %s", url, code, req_index.content)
raise AirflowException(f"Did not get 200 when submitting the Druid job to {url}")
raise AirflowException(f"Did not get 200 or 202 when submitting the Druid job to {url}")

req_json = req_index.json()
# Wait until the job is completed
Expand Down
2 changes: 2 additions & 0 deletions tests/providers/apache/druid/hooks/test_druid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def test_submit_gone_wrong(self, requests_mock):
def test_submit_ok(self, requests_mock):
task_post = requests_mock.post(
"http://druid-overlord:8081/druid/indexer/v1/task",
status_code=200,
text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
)
status_check = requests_mock.get(
Expand All @@ -81,6 +82,7 @@ def test_submit_ok(self, requests_mock):
def test_submit_sql_based_ingestion_ok(self, requests_mock):
task_post = requests_mock.post(
"http://druid-overlord:8081/druid/v2/sql/task",
status_code=202,
text='{"taskId":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
)
status_check = requests_mock.get(
Expand Down