Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 81F5D114EB for ; Fri, 13 Jun 2014 12:45:15 +0000 (UTC) Received: (qmail 36121 invoked by uid 500); 13 Jun 2014 12:45:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36017 invoked by uid 500); 13 Jun 2014 12:45:15 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 35898 invoked by uid 99); 13 Jun 2014 12:45:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 12:45:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CAF9F932F7C; Fri, 13 Jun 2014 12:45:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 13 Jun 2014 12:45:16 -0000 Message-Id: <3405f18e51494c60830becd6932db7e9@git.apache.org> In-Reply-To: <9a9d697d827d426fa6f5b5747735b0ed@git.apache.org> References: <9a9d697d827d426fa6f5b5747735b0ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: Track metrics at a keyspace level Track metrics at a keyspace level Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7065b1bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7065b1bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7065b1bd Branch: refs/heads/cassandra-1.2 Commit: 7065b1bdf119e07f2e64735f60ab3e3d036c00de Parents: d509fe1 Author: Brandon Williams Authored: Thu Jun 12 18:42:21 2014 -0500 Committer: Brandon Williams Committed: Thu Jun 12 18:48:11 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Table.java | 4 + .../cassandra/metrics/KeyspaceMetrics.java | 202 +++++++++++++++++++ 3 files changed, 207 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7065b1bd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f37eda4..28b5f29 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.17 + * Track metrics at a keyspace level (CASSANDRA-6539) * Add replace_address_first_boot flag to only replace if not bootstrapped (CASSANDRA-7356) * Enable keepalive for native protocol (CASSANDRA-7380) * Check internal addresses for seeds (CASSANDRA-6523) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7065b1bd/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java index e6df982..611fd9a 100644 --- a/src/java/org/apache/cassandra/db/Table.java +++ b/src/java/org/apache/cassandra/db/Table.java @@ -42,6 +42,7 @@ import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tracing.Tracing; +import org.apache.cassandra.metrics.KeyspaceMetrics; /** * It represents a Keyspace. @@ -74,6 +75,7 @@ public class Table private final ConcurrentMap columnFamilyStores = new ConcurrentHashMap(); private final Object[] indexLocks; private volatile AbstractReplicationStrategy replicationStrategy; + public final KeyspaceMetrics metric; public static final Function tableTransformer = new Function() { public Table apply(String tableName) @@ -132,6 +134,7 @@ public class Table { for (ColumnFamilyStore cfs : t.getColumnFamilyStores()) t.unloadCf(cfs); + t.metric.release(); } return t; } @@ -271,6 +274,7 @@ public class Table logger.debug("Initializing {}.{}", name, cfm.cfName); initCf(cfm.cfId, cfm.cfName, loadSSTables); } + this.metric = new KeyspaceMetrics(this); } public void createReplicationStrategy(KSMetaData ksm) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7065b1bd/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java new file mode 100644 index 0000000..4a0980f --- /dev/null +++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java @@ -0,0 +1,202 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.metrics; + +import java.util.ArrayList; +import java.util.List; + +import com.yammer.metrics.Metrics; +import com.yammer.metrics.core.*; +import com.yammer.metrics.stats.Snapshot; + +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; + +/** + * Metrics for {@link ColumnFamilyStore}. + */ +public class KeyspaceMetrics +{ + /** Total amount of data stored in the memtable, including column related overhead. */ + public final Gauge memtableDataSize; + /** Total amount of data stored in the memtables (2i and pending flush memtables included). */ + public final Gauge allMemtablesDataSize; + /** Total number of columns present in the memtable. */ + public final Gauge memtableColumnsCount; + /** Number of times flush has resulted in the memtable being switched out. */ + public final Gauge memtableSwitchCount; + /** Estimated number of tasks pending for this column family */ + public final Gauge pendingTasks; + /** Estimate of number of pending compactios for this CF */ + public final Gauge pendingCompactions; + /** Disk space used by SSTables belonging to this CF */ + public final Gauge liveDiskSpaceUsed; + /** Total disk space used by SSTables belonging to this CF, including obsolete ones waiting to be GC'd */ + public final Gauge totalDiskSpaceUsed; + /** Disk space used by bloom filter */ + public final Gauge bloomFilterDiskSpaceUsed; + + private final MetricNameFactory factory; + + /** + * Creates metrics for given {@link ColumnFamilyStore}. + * + * @param ks Keyspace to measure metrics + */ + public KeyspaceMetrics(final Keyspace ks) + { + factory = new KeyspaceMetricNameFactory(ks); + + memtableColumnsCount = Metrics.newGauge(factory.createMetricName("MemtableColumnsCount"), new Gauge() + { + public Long value() + { + long total = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + total += cf.metric.memtableColumnsCount.value(); + } + return total; + } + }); + memtableDataSize = Metrics.newGauge(factory.createMetricName("MemtableDataSize"), new Gauge() + { + public Long value() + { + long total = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + total += cf.metric.memtableDataSize.value(); + } + return total; + } + }); + allMemtablesDataSize = Metrics.newGauge(factory.createMetricName("AllMemtablesDataSize"), new Gauge() + { + public Long value() + { + long total = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + total += cf.metric.allMemtablesDataSize.value(); + } + return total; + } + }); + memtableSwitchCount = Metrics.newGauge(factory.createMetricName("MemtableSwitchCount"), new Gauge() + { + public Long value() + { + long sum = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + sum += cf.metric.memtableSwitchCount.count(); + return sum; + } + }); + pendingCompactions = Metrics.newGauge(factory.createMetricName("PendingCompactions"), new Gauge() + { + public Integer value() + { + int sum = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + sum += cf.metric.pendingCompactions.value(); + } + return sum; + } + }); + pendingTasks = Metrics.newGauge(factory.createMetricName("PendingTasks"), new Gauge() + { + public Integer value() + { + return Keyspace.switchLock.getQueueLength(); + } + }); + liveDiskSpaceUsed = Metrics.newGauge(factory.createMetricName("LiveDiskSpaceUsed"), new Gauge() + { + public Long value() + { + long sum = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + sum += cf.metric.liveDiskSpaceUsed.count(); + } + return sum; + } + }); + totalDiskSpaceUsed = Metrics.newGauge(factory.createMetricName("TotalDiskSpaceUsed"), new Gauge() + { + public Long value() + { + long sum = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + { + sum += cf.metric.totalDiskSpaceUsed.count(); + } + return sum; + } + }); + bloomFilterDiskSpaceUsed = Metrics.newGauge(factory.createMetricName("BloomFilterDiskSpaceUsed"), new Gauge() + { + public Long value() + { + long total = 0; + for (ColumnFamilyStore cf : ks.getColumnFamilyStores()) + total += cf.metric.bloomFilterDiskSpaceUsed.value(); + return total; + } + }); + } + + /** + * Release all associated metrics. + */ + public void release() + { + Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesDataSize")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableDataSize")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingTasks")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveDiskSpaceUsed")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("TotalDiskSpaceUsed")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed")); + } + + class KeyspaceMetricNameFactory implements MetricNameFactory + { + private final String keyspaceName; + + KeyspaceMetricNameFactory(Keyspace ks) + { + this.keyspaceName = ks.getName(); + } + + public MetricName createMetricName(String metricName) + { + String groupName = ColumnFamilyMetrics.class.getPackage().getName(); + + StringBuilder mbeanName = new StringBuilder(); + mbeanName.append(groupName).append(":"); + mbeanName.append("type=Keyspace"); + mbeanName.append(",keyspace=").append(keyspaceName); + mbeanName.append(",name=").append(metricName); + + return new MetricName(groupName, "keyspace", metricName, keyspaceName, mbeanName.toString()); + } + } +}