Merge pull request #7264 from ClickHouse/disable-memory-tracker-for-stack-trace

KochetovNicolai · web-flow · commit 9a89ee8eabf3 · 2019-10-11T00:45:36.000+03:00
Disable memory tracker for exception stack.
diff --git a/dbms/src/Interpreters/executeQuery.cpp b/dbms/src/Interpreters/executeQuery.cpp
@@ -120,6 +120,10 @@ static void logQuery(const String & query, const Context & context, bool interna
 /// Call this inside catch block.
 static void setExceptionStackTrace(QueryLogElement & elem)
 {
+    /// Disable memory tracker for stack trace.
+    /// Because if exception is "Memory limit (for query) exceed", then we probably can't allocate another one string.
+    auto temporarily_disable_memory_tracker = getCurrentMemoryTrackerActionLock();
+
     try
     {
         throw;

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,10 @@ static void logQuery(const String & query, const Context & context, bool interna`
`120`	`120`	`/// Call this inside catch block.`
`121`	`121`	`static void setExceptionStackTrace(QueryLogElement & elem)`
`122`	`122`	`{`
	`123`	`+ /// Disable memory tracker for stack trace.`
	`124`	`+ /// Because if exception is "Memory limit (for query) exceed", then we probably can't allocate another one string.`
	`125`	`+ auto temporarily_disable_memory_tracker = getCurrentMemoryTrackerActionLock();`
	`126`	`+`
`123`	`127`	`try`
`124`	`128`	`{`
`125`	`129`	`throw;`