From f08424392d428246d6ceb2bb48cfb10b6cf6f690 Mon Sep 17 00:00:00 2001 From: Shivam Raj Date: Thu, 3 Oct 2024 12:47:58 +0530 Subject: [PATCH 1/2] added error info on non-retryable error --- src/databricks/sql/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/databricks/sql/utils.py b/src/databricks/sql/utils.py index 2807bd2bb..f7efbe3b0 100644 --- a/src/databricks/sql/utils.py +++ b/src/databricks/sql/utils.py @@ -357,7 +357,12 @@ def user_friendly_error_message(self, no_retry_reason, attempt, elapsed): user_friendly_error_message = "{}: {}".format( user_friendly_error_message, self.error_message ) - return user_friendly_error_message + try: + error_context = str(self.error) + except: + error_context = "" + + return user_friendly_error_message + ". " + error_context # Taken from PyHive From 63454aeab2327e8a55de71c48200e5d2b0008638 Mon Sep 17 00:00:00 2001 From: Shivam Raj Date: Thu, 3 Oct 2024 16:52:42 +0530 Subject: [PATCH 2/2] default error context added --- src/databricks/sql/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/databricks/sql/utils.py b/src/databricks/sql/utils.py index f7efbe3b0..0575194c9 100644 --- a/src/databricks/sql/utils.py +++ b/src/databricks/sql/utils.py @@ -27,6 +27,7 @@ import logging BIT_MASKS = [1, 2, 4, 8, 16, 32, 64, 128] +DEFAULT_ERROR_CONTEXT = "Unknown error" logger = logging.getLogger(__name__) @@ -360,7 +361,7 @@ def user_friendly_error_message(self, no_retry_reason, attempt, elapsed): try: error_context = str(self.error) except: - error_context = "" + error_context = DEFAULT_ERROR_CONTEXT return user_friendly_error_message + ". " + error_context