You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/05/04 17:05:05 UTC
[03/10] cassandra git commit: Avoid starting Cassandra on JMX bind
failure
Avoid starting Cassandra on JMX bind failure
Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-11540
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93c5bc61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93c5bc61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93c5bc61
Branch: refs/heads/cassandra-3.7
Commit: 93c5bc616e21ffa7f31266ad095ca374f2ba73a4
Parents: 3d73282
Author: Alex Petrov <ol...@gmail.com>
Authored: Mon Apr 18 13:47:59 2016 +0200
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed May 4 17:55:47 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93c5bc61/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c7295d..0d9d3e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
* Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
* Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93c5bc61/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 6f38545..7e33e9c 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -98,7 +98,7 @@ public class CassandraDaemon
logger = LoggerFactory.getLogger(CassandraDaemon.class);
}
- private static void maybeInitJmx()
+ private void maybeInitJmx()
{
if (System.getProperty("com.sun.management.jmxremote.port") != null)
return;
@@ -119,7 +119,7 @@ public class CassandraDaemon
}
catch (IOException e)
{
- logger.error("Error starting local jmx server: ", e);
+ exitOrFail(1, e.getMessage(), e.getCause());
}
}