cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject cassandra git commit: Remove pre-startup check for open JMX port
Date Tue, 28 Jun 2016 16:17:25 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 3023d59ba -> c7ad00e3e


Remove pre-startup check for open JMX port

Patch by Tyler Hobbs; reviewed by Sam Tunnicliffe for CASSANDRA-12074


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

Branch: refs/heads/trunk
Commit: c7ad00e3ea13e326f7472996cf682b7b81087dea
Parents: 3023d59
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Jun 28 11:16:28 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Jun 28 11:16:28 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt   | 3 +++
 bin/cassandra | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ad00e3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 075d44a..ae6460e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+3.10
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+
 3.9
 Merged from 2.1:
  * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ad00e3/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 3206fdc..acf87cb 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -273,13 +273,6 @@ if [ "x$allow_root" != "xyes" ] ; then
     fi
 fi
 
-# see CASSANDRA-7254
-"$JAVA" -cp "$CLASSPATH" $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the
agent : java.lang.NullPointerException'
-if [ $? -ne "1" ]; then 
-    echo Unable to bind JMX, is Cassandra already running?
-    exit 1;
-fi
-
 # Start up the service
 launch_service "$pidfile" "$foreground" "$properties" "$classname"
 


Mime
View raw message