Lee-W commented on code in PR #42668:
URL: https://github.com/apache/airflow/pull/42668#discussion_r1792673551
##########
airflow/providers/databricks/hooks/databricks_sql.py:
##########
@@ -248,7 +269,24 @@ def run(
self.set_autocommit(conn, autocommit)
with closing(conn.cursor()) as cur:
- self._run_command(cur, sql_statement, parameters) # type:
ignore[attr-defined]
+ t = create_timeout_thread(cur, execution_timeout)
+
+ # TODO: adjust this to make testing easier
+ try:
+ self._run_command(cur, sql_statement, parameters) #
type: ignore[attr-defined]
+ except Exception as e:
+ if t is None or t.is_alive():
+ raise AirflowTaskExecutionError(
+ f"Error running statement: {sql_statement}.
{str(e)}"
+ )
+ else:
+ raise AirflowTaskExecutionTimeout(
+ f"Timeout threshold exceeded for query:
{sql_statement} was cancelled."
+ )
Review Comment:
```suggestion
if t is None or t.is_alive():
raise AirflowTaskExecutionError(
f"Error running statement: {sql_statement}.
{str(e)}"
)
raise AirflowTaskExecutionTimeout(
f"Timeout threshold exceeded for query:
{sql_statement} was cancelled."
)
```
##########
airflow/providers/databricks/exceptions.py:
##########
@@ -0,0 +1,32 @@
+#
+# 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.
+# Note: Any AirflowException raised is expected to cause the TaskInstance
+# to be marked in an ERROR state
+"""Exceptions used by Databricks Provider."""
+
+from __future__ import annotations
+
+from airflow.exceptions import AirflowException
+
+
+class AirflowTaskExecutionError(AirflowException):
+ """Raised when there is an error in task execution."""
+
+
+class AirflowTaskExecutionTimeout(AirflowTaskExecutionError):
+ """Raised when a task execution times out."""
Review Comment:
Instead of naming it as Airflow, should we make it more specific to
Databricks?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
