cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/6] cassandra git commit: mx4j does not work in 3.0.8
Date Wed, 12 Oct 2016 11:49:59 GMT
mx4j does not work in 3.0.8

patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12274


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5f2d0f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5f2d0f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5f2d0f0

Branch: refs/heads/trunk
Commit: d5f2d0f07f852f0475386c3585bd2efb2c16249b
Parents: 703b151
Author: Robert Stupp <snazy@snazy.de>
Authored: Wed Oct 12 13:43:03 2016 +0200
Committer: Robert Stupp <snazy@snazy-ds15.fritz.box>
Committed: Wed Oct 12 13:43:03 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5f2d0f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 81fb544..d797288 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.10
+ * mx4j does not work in 3.0.8 (CASSANDRA-12274)
  * Abort cqlsh copy-from in case of no answer after prolonged period of time (CASSANDRA-12740)
  * Avoid sstable corrupt exception due to dropped static column (CASSANDRA-12582)
  * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5f2d0f0/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 e3cd8cf..d87e0bf 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -164,6 +164,10 @@ public class CassandraDaemon
         if (FBUtilities.isWindows())
             WindowsFailedSnapshotTracker.deleteOldSnapshots();
 
+        maybeInitJmx();
+
+        Mx4jTool.maybeLoad();
+
         ThreadAwareSecurityManager.install();
 
         logSystemInfo();
@@ -195,8 +199,6 @@ public class CassandraDaemon
         // This should be the first write to SystemKeyspace (CASSANDRA-11742)
         SystemKeyspace.persistLocalMetadata();
 
-        maybeInitJmx();
-
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
         {
             public void uncaughtException(Thread t, Throwable e)
@@ -349,8 +351,6 @@ public class CassandraDaemon
             exitOrFail(1, "Fatal configuration error", e);
         }
 
-        Mx4jTool.maybeLoad();
-
         // Metrics
         String metricsReporterConfigFile = System.getProperty("cassandra.metricsReporterConfigFile");
         if (metricsReporterConfigFile != null)


Mime
View raw message