From commits-return-8063-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue Dec 17 12:59:16 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 98031180607 for ; Tue, 17 Dec 2019 13:59:16 +0100 (CET) Received: (qmail 5368 invoked by uid 500); 17 Dec 2019 12:59:16 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 5356 invoked by uid 99); 17 Dec 2019 12:59:15 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2019 12:59:15 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C3B578D80D; Tue, 17 Dec 2019 12:59:15 +0000 (UTC) Date: Tue, 17 Dec 2019 12:59:15 +0000 To: "commits@zookeeper.apache.org" Subject: =?utf-8?q?=5Bzookeeper=5D_branch_master_updated=3A_ZOOKEEPER-360?= =?utf-8?q?6=3A_add_JMXHOSTNAME_to_zkServer=2Esh_to_enable_user_to_chan?= =?utf-8?b?4oCm?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157658755565.306.11445219660540702197@gitbox.apache.org> From: andor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 19d85670a3c87565bc63a5f84169e4c6c72e2915 X-Git-Newrev: 48e5eaadffd8e23d2f47fe3eb0d0437b172dcd39 X-Git-Rev: 48e5eaadffd8e23d2f47fe3eb0d0437b172dcd39 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zookeeper.git The following commit(s) were added to refs/heads/master by this push: new 48e5eaa ZOOKEEPER-3606: add JMXHOSTNAME to zkServer.sh to enable user to chan… 48e5eaa is described below commit 48e5eaadffd8e23d2f47fe3eb0d0437b172dcd39 Author: Chia-Ping Tsai AuthorDate: Tue Dec 17 13:59:09 2019 +0100 ZOOKEEPER-3606: add JMXHOSTNAME to zkServer.sh to enable user to chan… Add a extra option "JMXHOSTNAME" used to define the hostname bound by metrics service. It is useful to users who make metrics service to response specific hostname when using JMX. Author: Chia-Ping Tsai Reviewers: eolivelli@apache.org, fangmin@apache.org Closes #1141 from chia7712/fix_3606 --- bin/zkServer.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/zkServer.sh b/bin/zkServer.sh index ec3db14..10ead60 100755 --- a/bin/zkServer.sh +++ b/bin/zkServer.sh @@ -68,7 +68,13 @@ then echo "ZooKeeper remote JMX authenticate set to $JMXAUTH" >&2 echo "ZooKeeper remote JMX ssl set to $JMXSSL" >&2 echo "ZooKeeper remote JMX log4j set to $JMXLOG4J" >&2 - ZOOMAIN="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$JMXPORT -Dcom.sun.management.jmxremote.authenticate=$JMXAUTH -Dcom.sun.management.jmxremote.ssl=$JMXSSL -Dzookeeper.jmx.log4j.disable=$JMXLOG4J org.apache.zookeeper.server.quorum.QuorumPeerMain" + if [ "x$JMXHOSTNAME" = "x" ] + then + ZOOMAIN="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$JMXPORT -Dcom.sun.management.jmxremote.authenticate=$JMXAUTH -Dcom.sun.management.jmxremote.ssl=$JMXSSL -Dzookeeper.jmx.log4j.disable=$JMXLOG4J org.apache.zookeeper.server.quorum.QuorumPeerMain" + else + echo "ZooKeeper remote JMX Hostname set to $JMXHOSTNAME" >&2 + ZOOMAIN="-Dcom.sun.management.jmxremote -Djava.rmi.server.hostname=$JMXHOSTNAME -Dcom.sun.management.jmxremote.port=$JMXPORT -Dcom.sun.management.jmxremote.authenticate=$JMXAUTH -Dcom.sun.management.jmxremote.ssl=$JMXSSL -Dzookeeper.jmx.log4j.disable=$JMXLOG4J org.apache.zookeeper.server.quorum.QuorumPeerMain" + fi fi else echo "JMX disabled by user request" >&2