Repository: cassandra Updated Branches: refs/heads/trunk a13add64f -> 98cbd561e
Revert "Allow metrics export for prometheus in its native format" This reverts commit 33f2f844b6bef7b3e5977f649bb2bfaf2e4db904. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98cbd561 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98cbd561 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98cbd561 Branch: refs/heads/trunk Commit: 98cbd561e286ca3191c3d64527ff649256f2e3a6 Parents: a13add6 Author: Robert Stupp <[email protected]> Authored: Fri Jun 24 21:50:13 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Jun 24 21:50:13 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 - NEWS.txt | 5 --- .../cassandra/service/CassandraDaemon.java | 35 -------------------- 3 files changed, 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98cbd561/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9495c96..d40cab4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,4 @@ 3.8 - * Allow metrics export for prometheus in its native format (CASSANDRA-11967) * Move skip_stop_words filter before stemming (CASSANDRA-12078) * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) http://git-wip-us.apache.org/repos/asf/cassandra/blob/98cbd561/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 11e3b37..7418f3a 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -19,11 +19,6 @@ using the provided 'sstableupgrade' tool. New features ------------ - - Support for alternative metrics exporters has been added. To use them, the appropiate - libraries need to be placed in the lib directory. Cassandra will load the class given in - the system property cassandra.metricsExporter and instantiate it by calling the constructor - taking an instance of com.codahale.metrics.MetricRegistry. If the provided class implements - java.io.Closeable, its close() method will be called on shutdown. - Shared pool threads are now named according to the stage they are executing tasks for. Thread names mentioned in traced queries change accordingly. - A new option has been added to cassandra-stress "-rate fixed={number}/s" http://git-wip-us.apache.org/repos/asf/cassandra/blob/98cbd561/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index b1c44be..2d21bff 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -17,12 +17,10 @@ */ package org.apache.cassandra.service; -import java.io.Closeable; import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; import java.lang.management.MemoryPoolMXBean; -import java.lang.reflect.Constructor; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; @@ -42,7 +40,6 @@ import org.slf4j.LoggerFactory; import com.addthis.metrics3.reporter.config.ReporterConfig; import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistryListener; import com.codahale.metrics.SharedMetricRegistries; import org.apache.cassandra.batchlog.LegacyBatchlogMigrator; @@ -368,38 +365,6 @@ public class CassandraDaemon } } - // Alternative metrics - String metricsExporterClass = System.getProperty("cassandra.metricsExporter"); - if (metricsExporterClass != null) - { - logger.info("Trying to initialize metrics-exporter {}", metricsExporterClass); - try - { - Constructor<?> ctor = Class.forName(metricsExporterClass).getConstructor(MetricRegistry.class); - Object metricsExporter = ctor.newInstance(CassandraMetricsRegistry.Metrics); - if (metricsExporter.getClass().isAssignableFrom(Closeable.class)) - { - Runtime.getRuntime().addShutdownHook(new Thread() { - public void run() - { - try - { - ((Closeable)metricsExporter).close(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - }); - } - } - catch (Exception e) - { - logger.warn("Failed to initialize metrics-exporter", e); - } - } - // start server internals StorageService.instance.registerDaemon(this); try
