Repository: cassandra Updated Branches: refs/heads/trunk e6b8e7a72 -> 6d1446ff0
Add chunks cache metrics to caches virtual table patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for CASSANDRA-14626 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d1446ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d1446ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d1446ff Branch: refs/heads/trunk Commit: 6d1446ff062ac322b203e16ea0bf0ed8fd1fa5ca Parents: e6b8e7a Author: Aleksey Yeshchenko <[email protected]> Authored: Wed Aug 8 16:51:11 2018 +0100 Committer: Aleksey Yeshchenko <[email protected]> Committed: Tue Aug 21 13:35:41 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/db/virtual/CachesTable.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1446ff/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5fa28f5..aeaf8ce 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,7 +12,7 @@ * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627) * Update netty to 4.1.128 (CASSANDRA-14633) * Add a virtual table to expose thread pools (CASSANDRA-14523) - * Add a virtual table to expose caches (CASSANDRA-14538) + * Add a virtual table to expose caches (CASSANDRA-14538, CASSANDRA-14626) * Fix toDate function for timestamp arguments (CASSANDRA-14502) * Revert running dtests by default in circleci (CASSANDRA-14614) * Stream entire SSTables when possible (CASSANDRA-14556) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1446ff/src/java/org/apache/cassandra/db/virtual/CachesTable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/virtual/CachesTable.java b/src/java/org/apache/cassandra/db/virtual/CachesTable.java index e5f80f7..5a265e6 100644 --- a/src/java/org/apache/cassandra/db/virtual/CachesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/CachesTable.java @@ -17,6 +17,7 @@ */ package org.apache.cassandra.db.virtual; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.dht.LocalPartitioner; import org.apache.cassandra.metrics.CacheMetrics; @@ -69,9 +70,13 @@ final class CachesTable extends AbstractVirtualTable public DataSet data() { SimpleDataSet result = new SimpleDataSet(metadata()); + + if (null != ChunkCache.instance) + addRow(result, "chunks", ChunkCache.instance.metrics); addRow(result, "counters", CacheService.instance.counterCache.getMetrics()); addRow(result, "keys", CacheService.instance.keyCache.getMetrics()); addRow(result, "rows", CacheService.instance.rowCache.getMetrics()); + return result; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
