Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 194329d3c -> 470f15be6 refs/heads/cassandra-3.0 fee2a3a09 -> 58e8008a5 refs/heads/cassandra-3.11 99881b971 -> c38e618d6 refs/heads/trunk 7fa1577c2 -> 333ebd67a
Fix weightedSize() for row-cache reported by JMX and NodeTool patch by Fuud; reviewed by Robert Stupp for CASSANDRA-13393 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470f15be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470f15be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470f15be Branch: refs/heads/cassandra-2.2 Commit: 470f15be652ffb3c471161d6fb10c8893ff59e46 Parents: 194329d Author: Fuud <fuudtorrent...@gmail.com> Authored: Sun Apr 9 10:54:25 2017 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Apr 9 10:54:25 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6ea2d59..366db50 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) * Fix JVM metric paths (CASSANDRA-13103) * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) * Discard in-flight shadow round responses (CASSANDRA-12653) http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/src/java/org/apache/cassandra/cache/OHCProvider.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java index 9b1c8cf..ab2745a 100644 --- a/src/java/org/apache/cassandra/cache/OHCProvider.java +++ b/src/java/org/apache/cassandra/cache/OHCProvider.java @@ -100,7 +100,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry> public long weightedSize() { - return ohCache.size(); + return ohCache.memUsed(); } public void clear()
