Re: [devel] [PATCH 2 of 2] opensafd: kill amfnd if it does not exit in time during opensaf shutdown [#1630]

[Hans N. <han...@er...>]

ack, code review only./Thanks HansN

On 12/21/2015 12:32 PM, pra...@or... wrote:
>   osaf/services/infrastructure/nid/scripts/opensafd.in |  4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
>
> During opensaf shutdown phase, if amfnd does not exit in configure OPENSAF_TERMTIMEOUT, then
> kill amfnd process after timeout.
>
> diff --git a/osaf/services/infrastructure/nid/scripts/opensafd.in b/osaf/services/infrastructure/nid/scripts/opensafd.in
> --- a/osaf/services/infrastructure/nid/scripts/opensafd.in
> +++ b/osaf/services/infrastructure/nid/scripts/opensafd.in
> @@ -254,6 +254,10 @@ stop() {
>   			timeout=$((timeout-1))
>   		done
>   		[ -d /proc/$amfpid ] && RETVAL=1
> +		if [ $RETVAL -eq 1 ]; then
> +			logger -t $prog "amfnd not exited, killing its process"
> +			kill -9 $amfpid
> +		fi
>   	else
>   		pkill -9 osaf* >/dev/null 2>&1
>   	fi