Attachment 213049 Details for Bug 235006 – v2 of netdata rc script overhaul checks user name consistency and kills zombie slaves

[patch] v2 of netdata rc script overhaul checks user name consistency and kills zombie slaves

netdata-1.20.0_2.v2.patch (text/plain), 3.58 KB, created by Matthias Andree on 2020-04-04 09:23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2020-04-04 09:23:11 UTC

Size: 3.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 530481)
>+++ Makefile	(Arbeitskopie)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	netdata
> PORTVERSION=	1.20.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net-mgmt
> 
>Index: files/netdata.in
>===================================================================
>--- files/netdata.in	(Revision 530481)
>+++ files/netdata.in	(Arbeitskopie)
>@@ -13,6 +13,13 @@
> #				Set it to "YES" to enable netdata.
> # netdata_args (str):		Custom additional arguments to be passed
> #				to netdata (default empty).
>+# netdata_conf (str):		Custom configuration file for netdata
>+#				(default: %%ETCDIR%%/netdata.conf)
>+# netdata_user (str):		Custom user to run netdata as
>+#				(default: read from netdata_conf if
>+#				 it is set there, or "netdata")
>+# netdata_stop_maxwait (int):	Maximum time to wait for termination on stop
>+#				before resorting to SIGKILL to stop netdata.
> #
> 
> . /etc/rc.subr
>@@ -19,18 +26,87 @@
> 
> name="netdata"
> rcvar=netdata_enable
>+SED=/usr/bin/sed
>+TR=/usr/bin/tr
> 
> load_rc_config $name
> 
> : ${netdata_enable="NO"}
>-: ${netdata_user="netdata"}
>+: ${netdata_conf="%%ETCDIR%%/${name}.conf"}
> : ${netdata_pid="%%NETDATA_PERST%%/${name}.pid"}
>+: # netdata_user set below, it may also be pulled from the netdata_conf file
>+: ${netdata_stop_maxwait=30}
> 
>+# read netdata_conf and print the "run as user =" RHS, or print nothing if unset
>+#
>+# only permits ASCII letters, digits, dash, underscore - does not permit
>+# backtick, curly braces, angle brackets, backslash although passwd(5) would
>+# permit these.
>+get_user_from_conf() {
>+	$SED -n '/^\[global\]/,/^\[/{s/^[[:space:]]*run as user.*=[[:space:]]*$.*$[[:space:]]*$/\1/p;}' "${netdata_conf}" \
>+	| $TR -c -d 'a-zA-Z0-9_-'
>+}
>+
>+# check if the rc.conf* file set and netdata_conf agree on the name to run the bundle as
>+check_user_consistency() {
>+	cfusr=$(get_user_from_conf)
>+	if [ -z "$cfusr" -o "$cfusr" = "${netdata_user}" ] ; then return 0 ; fi
>+	echo >&2 "$0: ERROR: ${netdata_conf} sets 'run as user = $cfusr', but rc.conf* sets '${netdata_user}'. Both must be consistent."
>+	return 1
>+}
>+
>+stop_cmd() {
>+	rc_pid=$(check_pidfile "${netdata_pid}" "${procname}")
>+	if [ -z "$rc_pid" ] ; then
>+		[ -n "$fc_fast" ] && return 0
>+		_run_rc_notrunning
>+		return 1
>+	fi
>+	_prefix=
>+	slave_pids=$(pgrep -P $rc_pid)
>+	echo "Stopping ${name}."
>+	_list="$rc_pid $slave_pids"
>+	kill -TERM $_list
>+	wtim=0
>+	while :; do
>+		_nlist=
>+		for _j in $_list ; do
>+			if kill -0 $_j 2>/dev/null ; then
>+				_nlist="$_nlist $_j"
>+				[ -n "$_prefix" ] && sleep 1
>+			fi
>+		done
>+		if [ -z "$_nlist" ] ; then
>+			break
>+		fi
>+		_list=$_nlist
>+		echo -n ${_prefix:-"Waiting for PIDS: "}$_list
>+		_prefix=", "
>+		pwait -t 2 $_list 2>/dev/null
>+		wtim=$(($wtim + 3))
>+		if [ $wtim -gt ${netdata_stop_maxwait} ] ; then
>+			echo -n "${_prefix}SIGKILL $_list"
>+			kill -KILL $_list
>+			break
>+		fi
>+	done
>+	[ -n "$_prefix" ] && echo .
>+}
>+
>+# obtain default user, first from configuration, or default to "netdata"
>+    _netdata_user_default=$(get_user_from_conf)
>+: ${_netdata_user_default:="netdata"}
>+# and then if, rc.conf* don't set it, use the default
>+: ${netdata_user="${_netdata_user_default}"}
>+
> procname="%%PREFIX%%/sbin/${name}"
> command="/usr/sbin/daemon"
>-command_args="-c -f ${procname} -u ${netdata_user} -P ${netdata_pid} ${netdata_args}"
>+command_args="-c -f \"${procname}\" -u \"${netdata_user}\" -P \"${netdata_pid}\" ${netdata_args}"
> 
>-required_files="%%ETCDIR%%/${name}.conf"
>+required_files="${netdata_conf}"
> 
>+start_precmd=check_user_consistency
>+
>+stop_cmd=stop_cmd
>+
> run_rc_command "$1"
>-

Actions: View | Diff

Attachments on bug 235006: 212936 | 213049