natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Jeff Jirsa 2018-05-12 21:09:04 +05:30
parent 4f1094e668 28058608f1
commit dd650c8e86
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -240,6 +240,7 @@
3.11.3
* Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
* Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
* Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
* Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)

7
src/java/org/apache/cassandra/utils/memory/BufferPool.java
View File

@ -265,8 +265,7 @@ public class BufferPool
if (cur + MACRO_CHUNK_SIZE > MEMORY_USAGE_THRESHOLD)
{
noSpamLogger.info("Maximum memory usage reached ({}), cannot allocate chunk of {}",
FBUtilities.prettyPrintMemory(MEMORY_USAGE_THRESHOLD),
FBUtilities.prettyPrintMemory(MACRO_CHUNK_SIZE));
MEMORY_USAGE_THRESHOLD, MACRO_CHUNK_SIZE);
return false;
}
if (memoryUsage.compareAndSet(cur, cur + MACRO_CHUNK_SIZE))
@ -284,9 +283,7 @@ public class BufferPool
noSpamLogger.error("Buffer pool failed to allocate chunk of {}, current size {} ({}). " +
"Attempting to continue; buffers will be allocated in on-heap memory which can degrade performance. " +
"Make sure direct memory size (-XX:MaxDirectMemorySize) is large enough to accommodate off-heap memtables and caches.",
FBUtilities.prettyPrintMemory(MACRO_CHUNK_SIZE),
FBUtilities.prettyPrintMemory(sizeInBytes()),
oom.toString());
MACRO_CHUNK_SIZE, sizeInBytes(), oom.toString());
return false;
}