natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mx4j does not work in 3.0.8 

patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12274
This commit is contained in:
Robert Stupp 2016-10-12 13:43:03 +02:00 committed by Robert Stupp
parent 703b151b15
commit d5f2d0f07f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.0.10 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) * 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) * 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) * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478)

8
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -164,6 +164,10 @@ public class CassandraDaemon
if (FBUtilities.isWindows()) if (FBUtilities.isWindows())
WindowsFailedSnapshotTracker.deleteOldSnapshots(); WindowsFailedSnapshotTracker.deleteOldSnapshots();
maybeInitJmx();
Mx4jTool.maybeLoad();
ThreadAwareSecurityManager.install(); ThreadAwareSecurityManager.install();
logSystemInfo(); logSystemInfo();
@ -195,8 +199,6 @@ public class CassandraDaemon
// This should be the first write to SystemKeyspace (CASSANDRA-11742) // This should be the first write to SystemKeyspace (CASSANDRA-11742)
SystemKeyspace.persistLocalMetadata(); SystemKeyspace.persistLocalMetadata();
maybeInitJmx();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
{ {
public void uncaughtException(Thread t, Throwable e) public void uncaughtException(Thread t, Throwable e)
@ -349,8 +351,6 @@ public class CassandraDaemon
exitOrFail(1, "Fatal configuration error", e); exitOrFail(1, "Fatal configuration error", e);
} }
Mx4jTool.maybeLoad();
// Metrics // Metrics
String metricsReporterConfigFile = System.getProperty("cassandra.metricsReporterConfigFile"); String metricsReporterConfigFile = System.getProperty("cassandra.metricsReporterConfigFile");
if (metricsReporterConfigFile != null) if (metricsReporterConfigFile != null)