Repository: cassandra Updated Branches: refs/heads/trunk 4b777d627 -> 41ef972b1
simplify mx4j configuration patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13578 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41ef972b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41ef972b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41ef972b Branch: refs/heads/trunk Commit: 41ef972b181e442f41b53f5cce4def27ceac9e49 Parents: 4b777d6 Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Tue Jun 6 17:41:56 2017 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Aug 24 09:13:56 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 23 ++++++++++++++++---- .../org/apache/cassandra/utils/Mx4jTool.java | 10 +++++---- 3 files changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ef972b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0a4726b..858312e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * simplify mx4j configuration (Cassandra-13578) * Fix trigger example on 4.0 (CASSANDRA-13796) * force minumum timeout value (CASSANDRA-9375) * use netty for streaming (CASSANDRA-12229) http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ef972b/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 347fbf3..c80e05d 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -282,15 +282,30 @@ JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.password.file=/etc/cassandra/ # See http://wiki.apache.org/cassandra/Operations#Monitoring_with_MX4J # By default mx4j listens on 0.0.0.0:8081. Uncomment the following lines # to control its listen address and port. -#MX4J_ADDRESS="-Dmx4jaddress=127.0.0.1" -#MX4J_PORT="-Dmx4jport=8081" +#MX4J_ADDRESS="127.0.0.1" +#MX4J_PORT="8081" # Cassandra uses SIGAR to capture OS metrics CASSANDRA-7838 # for SIGAR we have to set the java.library.path # to the location of the native libraries. JVM_OPTS="$JVM_OPTS -Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin" -JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS" -JVM_OPTS="$JVM_OPTS $MX4J_PORT" +if [ "x$MX4J_ADDRESS" != "x" ]; then + if [[ "$MX4J_ADDRESS" == \-Dmx4jaddress* ]]; then + # Backward compatible with the older style #13578 + JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS" + else + JVM_OPTS="$JVM_OPTS -Dmx4jaddress=$MX4J_ADDRESS" + fi +fi +if [ "x$MX4J_PORT" != "x" ]; then + if [[ "$MX4J_PORT" == \-Dmx4jport* ]]; then + # Backward compatible with the older style #13578 + JVM_OPTS="$JVM_OPTS $MX4J_PORT" + else + JVM_OPTS="$JVM_OPTS -Dmx4jport=$MX4J_PORT" + fi +fi + JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ef972b/src/java/org/apache/cassandra/utils/Mx4jTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/Mx4jTool.java b/src/java/org/apache/cassandra/utils/Mx4jTool.java index 41a5b33..cd42aca 100644 --- a/src/java/org/apache/cassandra/utils/Mx4jTool.java +++ b/src/java/org/apache/cassandra/utils/Mx4jTool.java @@ -21,6 +21,7 @@ import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,17 +77,18 @@ public class Mx4jTool private static String getAddress() { - return System.getProperty("mx4jaddress", FBUtilities.getBroadcastAddress().getHostAddress()); + String sAddress = System.getProperty("mx4jaddress"); + if (StringUtils.isEmpty(sAddress)) + sAddress = FBUtilities.getBroadcastAddress().getHostAddress(); + return sAddress; } private static int getPort() { int port = 8081; String sPort = System.getProperty("mx4jport"); - if (sPort != null && !sPort.equals("")) - { + if (StringUtils.isNotEmpty(sPort)) port = Integer.parseInt(sPort); - } return port; } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org