Merge branch 'cassandra-4.1' into trunk

apache · Feb 2, 2023 · a07c15d · a07c15d
2 parents 1e68521 + 209ba28
commit a07c15d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -106,6 +106,7 @@ Merged from 4.1:
  * Streaming progress virtual table lock contention can trigger TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
  * Fix perpetual load of denylist on read in cases where denylist can never be loaded (CASSANDRA-18116)
 Merged from 4.0:
+ * Add cache type information for maximum memory usage warning message (CASSANDRA-18184)
  * Fix NPE in fqltool dump on null value (CASSANDRA-18113)
  * Improve unit tests performance (CASSANDRA-17427)
  * Connect to listen address when own broadcast address is requested (CASSANDRA-18200)

diff --git a/src/java/org/apache/cassandra/utils/memory/BufferPool.java b/src/java/org/apache/cassandra/utils/memory/BufferPool.java
@@ -441,8 +441,8 @@ private Chunk allocateMoreChunks()
                 {
                     if (memoryUsageThreshold > 0)
                     {
-                        noSpamLogger.info("Maximum memory usage reached ({}), cannot allocate chunk of {}",
-                                          readableMemoryUsageThreshold, READABLE_MACRO_CHUNK_SIZE);
+                        noSpamLogger.info("Maximum memory usage reached ({}) for {} buffer pool, cannot allocate chunk of {}",
+                                          readableMemoryUsageThreshold, name, READABLE_MACRO_CHUNK_SIZE);
                     }
                     return null;
                 }