ignore_error_distributed_ddl_queue: ignore only syntax errors

ilejn · ilejn · commit e6180de73619 · 2025-05-31T12:59:43.000Z
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -29,6 +29,11 @@ namespace Setting
     extern const SettingsUInt64 max_query_size;
 }
 
+namespace ErrorCodes
+{
+    extern const int SYNTAX_ERROR;
+}
+
 enum class Status : uint8_t
 {
     INACTIVE,
@@ -92,11 +97,15 @@ static String clusterNameFromDDLQuery(ContextPtr context, const DDLTask & task)
         query = parseQuery(
             parser_query, begin, end, description, settings[Setting::max_query_size], settings[Setting::max_parser_depth], settings[Setting::max_parser_backtracks]);
     }
-    catch (const Exception &)
+    catch (const Exception & e)
     {
-        /// Best effort - ignore parse error and present available information
         LOG_INFO(getLogger("StorageSystemDDLWorkerQueue"), "Failed to determine cluster");
-        return "";
+        if (e.code() == ErrorCodes::SYNTAX_ERROR)
+        {
+            /// ignore parse error and present available information
+            return "";
+        }
+        throw;
     }
 
     String cluster_name;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ namespace Setting`
`29`	`29`	`extern const SettingsUInt64 max_query_size;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+namespace ErrorCodes`
	`33`	`+{`
	`34`	`+ extern const int SYNTAX_ERROR;`
	`35`	`+}`
	`36`	`+`
`32`	`37`	`enum class Status : uint8_t`
`33`	`38`	`{`
`34`	`39`	`INACTIVE,`
`@@ -92,11 +97,15 @@ static String clusterNameFromDDLQuery(ContextPtr context, const DDLTask & task)`
`92`	`97`	`query = parseQuery(`
`93`	`98`	`parser_query, begin, end, description, settings[Setting::max_query_size], settings[Setting::max_parser_depth], settings[Setting::max_parser_backtracks]);`
`94`	`99`	`}`
`95`		`- catch (const Exception &)`
	`100`	`+ catch (const Exception & e)`
`96`	`101`	`{`
`97`		`- /// Best effort - ignore parse error and present available information`
`98`	`102`	`LOG_INFO(getLogger("StorageSystemDDLWorkerQueue"), "Failed to determine cluster");`
`99`		`- return "";`
	`103`	`+ if (e.code() == ErrorCodes::SYNTAX_ERROR)`
	`104`	`+ {`
	`105`	`+ /// ignore parse error and present available information`
	`106`	`+ return "";`
	`107`	`+ }`
	`108`	`+ throw;`
`100`	`109`	`}`
`101`	`110`
`102`	`111`	`String cluster_name;`