diff --git a/CHANGES.txt b/CHANGES.txt index ebeb438956..3535b5f3c1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -118,6 +118,7 @@ Merged from 3.0: for a table that's in system_schema.tables (CASSANDRA-13180) * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410) Merged from 2.2: + * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) * Fix JVM metric names (CASSANDRA-13103) * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) * Discard in-flight shadow round responses (CASSANDRA-12653) diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java index eefb0f4cb3..afdc872f33 100644 --- a/src/java/org/apache/cassandra/cache/OHCProvider.java +++ b/src/java/org/apache/cassandra/cache/OHCProvider.java @@ -96,7 +96,7 @@ public class OHCProvider implements CacheProvider public long weightedSize() { - return ohCache.size(); + return ohCache.memUsed(); } public void clear()