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

Correct log message for statistics of offheap memtable flush 

Patch by Kurt Greaves; Reviewed by Jeff Jirsa for CASSANDRA-12776
This commit is contained in:
Jeff Jirsa 2016-10-18 18:09:42 -07:00
parent bc9a079394
commit 7d3062f2d5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -18,6 +18,7 @@
* Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
* Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
* If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
Merged from 2.2: Merged from 2.2:
* Clean up permissions when a UDA is dropped (CASSANDRA-12720) * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
* Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117) * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

2
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -1149,7 +1149,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
float flushingOnHeap = Memtable.MEMORY_POOL.onHeap.reclaimingRatio(); float flushingOnHeap = Memtable.MEMORY_POOL.onHeap.reclaimingRatio();
float flushingOffHeap = Memtable.MEMORY_POOL.offHeap.reclaimingRatio(); float flushingOffHeap = Memtable.MEMORY_POOL.offHeap.reclaimingRatio();
float thisOnHeap = largest.getAllocator().onHeap().ownershipRatio(); float thisOnHeap = largest.getAllocator().onHeap().ownershipRatio();
float thisOffHeap = largest.getAllocator().onHeap().ownershipRatio(); float thisOffHeap = largest.getAllocator().offHeap().ownershipRatio();
logger.debug("Flushing largest {} to free up room. Used total: {}, live: {}, flushing: {}, this: {}", logger.debug("Flushing largest {} to free up room. Used total: {}, live: {}, flushing: {}, this: {}",
largest.cfs, ratio(usedOnHeap, usedOffHeap), ratio(liveOnHeap, liveOffHeap), largest.cfs, ratio(usedOnHeap, usedOffHeap), ratio(liveOnHeap, liveOffHeap),
ratio(flushingOnHeap, flushingOffHeap), ratio(thisOnHeap, thisOffHeap)); ratio(flushingOnHeap, flushingOffHeap), ratio(thisOnHeap, thisOffHeap));