Merge branch 'customizations/24.3.12' into backports/24.3/72190-prefer_locahost_replica-in-parallel_distributed_insert_select

Enmk · web-flow · commit a4d6e84ddd6a · 2025-03-05T00:36:54.000+01:00
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
@@ -23,7 +23,7 @@ on: # yamllint disable-line rule:truthy
       - prereleased
   push:
     branches:
-      - 'releases/24.3**'
+      - '**/24.3*'
     tags:
       - '*'
   workflow_dispatch:
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
@@ -64,6 +64,7 @@ namespace ErrorCodes
     extern const int CANNOT_ALLOCATE_MEMORY;
     extern const int MEMORY_LIMIT_EXCEEDED;
     extern const int NOT_IMPLEMENTED;
+    extern const int TOO_MANY_SIMULTANEOUS_QUERIES;
 }
 
 constexpr const char * TASK_PROCESSED_OUT_REASON = "Task has been already processed";
@@ -523,6 +524,7 @@ bool DDLWorker::tryExecuteQuery(DDLTaskBase & task, const ZooKeeperPtr & zookeep
                                  e.code() != ErrorCodes::TABLE_IS_READ_ONLY &&
                                  e.code() != ErrorCodes::CANNOT_ASSIGN_ALTER &&
                                  e.code() != ErrorCodes::CANNOT_ALLOCATE_MEMORY &&
+                                 e.code() != ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES &&
                                  e.code() != ErrorCodes::MEMORY_LIMIT_EXCEEDED;
         return no_sense_to_retry;
     }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ namespace ErrorCodes`
`64`	`64`	`extern const int CANNOT_ALLOCATE_MEMORY;`
`65`	`65`	`extern const int MEMORY_LIMIT_EXCEEDED;`
`66`	`66`	`extern const int NOT_IMPLEMENTED;`
	`67`	`+ extern const int TOO_MANY_SIMULTANEOUS_QUERIES;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`constexpr const char * TASK_PROCESSED_OUT_REASON = "Task has been already processed";`
`@@ -523,6 +524,7 @@ bool DDLWorker::tryExecuteQuery(DDLTaskBase & task, const ZooKeeperPtr & zookeep`
`523`	`524`	`e.code() != ErrorCodes::TABLE_IS_READ_ONLY &&`
`524`	`525`	`e.code() != ErrorCodes::CANNOT_ASSIGN_ALTER &&`
`525`	`526`	`e.code() != ErrorCodes::CANNOT_ALLOCATE_MEMORY &&`
	`527`	`+ e.code() != ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES &&`
`526`	`528`	`e.code() != ErrorCodes::MEMORY_LIMIT_EXCEEDED;`
`527`	`529`	`return no_sense_to_retry;`
`528`	`530`	`}`