From owner-svn-ports-all@FreeBSD.ORG Mon Mar 30 15:55:28 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 910CC3EF; Mon, 30 Mar 2015 15:55:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C5216E2; Mon, 30 Mar 2015 15:55:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2UFtSAY066906; Mon, 30 Mar 2015 15:55:28 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2UFtS5G066905; Mon, 30 Mar 2015 15:55:28 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201503301555.t2UFtS5G066905@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Mon, 30 Mar 2015 15:55:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382681 - head/databases/py-carbon/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2015 15:55:28 -0000 Author: demon Date: Mon Mar 30 15:55:27 2015 New Revision: 382681 URL: https://svnweb.freebsd.org/changeset/ports/382681 QAT: https://qat.redports.org/buildarchive/r382681/ Log: Add an ability to start several carbon instances. This may be useful to balance load between CPU cores or to listen on IPv6 [::] in addition to IPv4 *. PR: 198734 Submitted by: Gennady Karpov Approved by: maintainer Modified: head/databases/py-carbon/files/carbon.in Modified: head/databases/py-carbon/files/carbon.in ============================================================================== --- head/databases/py-carbon/files/carbon.in Mon Mar 30 15:48:33 2015 (r382680) +++ head/databases/py-carbon/files/carbon.in Mon Mar 30 15:55:27 2015 (r382681) @@ -12,6 +12,8 @@ # # carbon_enable (bool): Set to NO by default. # Set it to YES to enable it. +# carbon_instances: Empty by default (start single instance). +# Space-separated list of instances to start. # carbon_conf: File where carbon configuration resides # Default: %%PREFIX%%/etc/carbon/carbon.conf # carbon_user: The user account carbon daemon runs as what @@ -35,26 +37,61 @@ rcvar=carbon_enable load_rc_config ${name} : ${carbon_enable:=NO} +: ${carbon_instances:=""} : ${carbon_user:=root} : ${carbon_group:=wheel} : ${carbon_conf:=%%PREFIX%%/etc/carbon/carbon.conf} : ${carbon_debug:=NO} : ${carbon_logdir:=/var/db/carbon/log/} -: ${pidfile:=/var/run/carbon.pid} +: ${carbon_pidfile:=/var/run/carbon.pid} + +is_carbon_instance() { + local instance + for instance in ${carbon_instances}; do + if [ "${instance}" = "$1" ]; then + return 0 + fi + done + return 1 +} + +if [ -n "${carbon_instances}" ]; then + if [ -n "$2" ]; then + instance="$2" + if ! is_carbon_instance ${instance}; then + echo "$0: no such instance defined in carbon_instances." + exit 1 + fi + instance_arg="--instance=${instance}" + eval carbon_user=\${carbon_${instance}_user:-"${carbon_user}"} + eval carbon_group=\${carbon_${instance}_group:-"${carbon_group}"} + eval carbon_conf=\${carbon_${instance}_conf:-"${carbon_conf}"} + eval carbon_debug=\${carbon_${instance}_debug:-"${carbon_debug}"} + eval carbon_logdir=\${carbon_${instance}_logdir:-"${carbon_logdir}"} + eval carbon_pidfile=\${carbon_${instance}_pidfile:-"/var/run/carbon-${instance}.pid"} + elif [ -n "$1" ]; then + for instance in ${carbon_instances}; do + echo "Processing carbon instance: ${instance}" + /usr/local/etc/rc.d/carbon $1 ${instance} + done + exit 0 + fi +fi stop_cmd="${name}_stop" required_files="${carbon_conf} %%PREFIX%%/etc/carbon/storage-schemas.conf" +pidfile=${carbon_pidfile} command_interpreter="%%PREFIX%%/bin/python2.7" command="%%PREFIX%%/bin/carbon-cache.py" -command_args="--config=${carbon_conf} --logdir ${carbon_logdir} --pidfile ${pidfile} start" +command_args="--config=${carbon_conf} ${instance_arg} --logdir ${carbon_logdir} --pidfile ${pidfile} start" carbon_stop() { echo "Stopping $name" pids=`check_pidfile ${pidfile} ${command} ${command_interpreter}` - %%PREFIX%%/bin/carbon-cache.py --config=${carbon_conf} --pidfile ${pidfile} stop + %%PREFIX%%/bin/carbon-cache.py --config=${carbon_conf} ${instance_arg} --pidfile ${pidfile} stop wait_for_pids ${pids} }