From 19a7daf368e62f23b664e1a713580f3fdf92b84e Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Wed, 1 Jul 2015 10:08:32 +0300 Subject: [PATCH 1/2] Adding the CacheMetrics class The CacheMetrics holds information per a specific Cache type (key, row or counter) It the clas was modified to use the API. The API definition can be found in cache_service.json under metrics. Signed-off-by: Amnon Heiman --- .../cassandra/metrics/CacheMetrics.java | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 src/main/java/org/apache/cassandra/metrics/CacheMetrics.java diff --git a/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java b/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java new file mode 100644 index 0000000..51b1ab5 --- /dev/null +++ b/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java @@ -0,0 +1,106 @@ +/* + * 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. + */ + +/* + * Copyright 2015 Cloudius Systems + * + * Modified by Cloudius Systems + */ +package org.apache.cassandra.metrics; + +import java.util.concurrent.TimeUnit; +import com.cloudius.urchin.api.APIClient; +import com.cloudius.urchin.metrics.APIMetrics; +import com.cloudius.urchin.metrics.DefaultNameFactory; +import com.cloudius.urchin.metrics.MetricNameFactory; +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.core.Meter; + +/** + * Metrics for {@code ICache}. + */ +public class CacheMetrics { + /** Cache capacity in bytes */ + public final Gauge capacity; + /** Total number of cache hits */ + public final Meter hits; + /** Total number of cache requests */ + public final Meter requests; + /** cache hit rate */ + public final Gauge hitRate; + /** Total size of cache, in bytes */ + public final Gauge size; + /** Total number of cache entries */ + public final Gauge entries; + + private APIClient c = new APIClient(); + + /** + * Create metrics for given cache. + * + * @param type + * Type of Cache to identify metrics. + * @param cache + * Cache to measure metrics + */ + public CacheMetrics(String type, String url) { + MetricNameFactory factory = new DefaultNameFactory("Cache", type); + + capacity = APIMetrics.newGauge(factory.createMetricName("Capacity"), + new Gauge() { + public Long value() { + return c.getLongValue("/cache_service/metrics/" + url + + "/capacity"); + } + }); + hits = APIMetrics.newMeter("/cache_service/metrics/" + url + + "/hits", factory.createMetricName("Hits"), "hits", + TimeUnit.SECONDS); + requests = APIMetrics.newMeter("/cache_service/metrics/" + url + + "/requests", factory.createMetricName("Requests"), + "requests", TimeUnit.SECONDS); + hitRate = APIMetrics.newGauge(factory.createMetricName("HitRate"), + new Gauge() { + @Override + public Double value() { + return c.getDoubleValue("/cache_service/metrics/" + url + + "/hit_rate"); + } + }); + size = APIMetrics.newGauge(factory.createMetricName("Size"), + new Gauge() { + public Long value() { + return c.getLongValue("/cache_service/metrics/" + url + + "/size"); + } + }); + entries = APIMetrics.newGauge(factory.createMetricName("Entries"), + new Gauge() { + public Integer value() { + return c.getIntValue("/cache_service/metrics/" + url + + "/entries"); + } + }); + } + + // for backward compatibility + @Deprecated + public double getRecentHitRate() { + return 0; + } +} From 366b744d7bfe9ac0d8a4f4ac57f354403ecbee7e Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Wed, 1 Jul 2015 10:11:21 +0300 Subject: [PATCH 2/2] Instantiate the CacheMetrics CacheService holds an instance of cache metrics per: key, row and counter. This instantiate the different metrics. After this petch it will be possible to connect with jsconsole and see those metrics Signed-off-by: Amnon Heiman --- .../java/org/apache/cassandra/service/CacheService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/org/apache/cassandra/service/CacheService.java b/src/main/java/org/apache/cassandra/service/CacheService.java index 08a07ab..65bd721 100644 --- a/src/main/java/org/apache/cassandra/service/CacheService.java +++ b/src/main/java/org/apache/cassandra/service/CacheService.java @@ -26,10 +26,13 @@ package org.apache.cassandra.service; import java.lang.management.ManagementFactory; import java.util.concurrent.ExecutionException; + import javax.management.MBeanServer; import javax.management.ObjectName; import javax.ws.rs.core.MultivaluedMap; +import org.apache.cassandra.metrics.CacheMetrics; + import com.cloudius.urchin.api.APIClient; import com.sun.jersey.core.util.MultivaluedMapImpl; @@ -44,6 +47,9 @@ public class CacheService implements CacheServiceMBean { public static final String MBEAN_NAME = "org.apache.cassandra.db:type=Caches"; + public final CacheMetrics keyCache; + public final CacheMetrics rowCache; + public final CacheMetrics counterCache; public final static CacheService instance = new CacheService(); public static CacheService getInstance() { @@ -59,6 +65,9 @@ public class CacheService implements CacheServiceMBean { throw new RuntimeException(e); } + keyCache = new CacheMetrics("KeyCache", "key"); + rowCache = new CacheMetrics("RowCache", "row"); + counterCache = new CacheMetrics("CounterCache", "counter"); } public int getRowCacheSavePeriodInSeconds() {