diff mbox series

[Openvpn-devel] make t_server_null "server alive?" check more robust

Message ID 20240918162917.6809-1-gert@greenie.muc.de
State Accepted
Headers
Series [Openvpn-devel] make t_server_null "server alive?" check more robust |

Commit Message

Gert Doering Sept. 18, 2024, 4:29 p.m. UTC 
  - use "$RUN_SUDO kill -0 $pid" to test if a given process is running, not
  "ps -p $pid" - the latter will not work if security.bsd.see_other_uids=0
  is set

- produce proper error messages if pid files can not be found or are
  empty at server shutdown time
---
 tests/t_server_null_client.sh | 5 ++++-
 tests/t_server_null_server.sh | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Frank Lichtenheld Sept. 19, 2024, 9:51 a.m. UTC | #1 
On Wed, Sep 18, 2024 at 06:29:17PM +0200, Gert Doering wrote:
> - use "$RUN_SUDO kill -0 $pid" to test if a given process is running, not
>   "ps -p $pid" - the latter will not work if security.bsd.see_other_uids=0
>   is set
> 
> - produce proper error messages if pid files can not be found or are
>   empty at server shutdown time
> ---
>  tests/t_server_null_client.sh | 5 ++++-
>  tests/t_server_null_server.sh | 5 +++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
> index e7dd3324..c1a25dfc 100755
> --- a/tests/t_server_null_client.sh
> +++ b/tests/t_server_null_client.sh
> @@ -87,7 +87,10 @@ while [ $count -lt $server_max_wait ]; do
>      # the active server count as the processes won't be running.
>      for i in `set|grep 'SERVER_NAME_'|cut -d "=" -f 2|tr -d "[\']"`; do
>          server_pid=$(cat $i.pid 2> /dev/null)
> -        if ps -p $server_pid > /dev/null 2>&1; then
> +        if [ -z "$server_pid" ] ; then
> +            continue
> +        fi
> +        if $RUN_SUDO kill -0 $server_pid > /dev/null 2>&1; then
>              servers_up=$(( $servers_up + 1 ))
>          fi
>      done
> diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh
> index e5906eec..32f0362d 100755
> --- a/tests/t_server_null_server.sh
> +++ b/tests/t_server_null_server.sh
> @@ -82,6 +82,11 @@ for PID_FILE in $server_pid_files
>  do
>      SERVER_PID=$(cat "${PID_FILE}")
>  
> +    if [ -z "$SERVER_PID" ] ; then
> +        echo "WARNING: could not kill server ${PID_FILE}!"
> +	continue

Indentation looks slightly wrong.

Otherwise looks good to me, so
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>

Regards,
Gert Doering Sept. 19, 2024, 10:02 a.m. UTC | #2 
Thanks for the review.  Indent fixed, that was a <tab> that sneaked in.

Patch has been applied to the master branch.

commit b322690394b75a9d4987d4b27107ccb01bbcd90e
Author: Gert Doering
Date:   Wed Sep 18 18:29:17 2024 +0200

     make t_server_null 'server alive?' check more robust

     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     Message-Id: <20240918162917.6809-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29314.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index e7dd3324..c1a25dfc 100755
--- a/tests/t_server_null_client.sh
+++ b/tests/t_server_null_client.sh
@@ -87,7 +87,10 @@  while [ $count -lt $server_max_wait ]; do
     # the active server count as the processes won't be running.
     for i in `set|grep 'SERVER_NAME_'|cut -d "=" -f 2|tr -d "[\']"`; do
         server_pid=$(cat $i.pid 2> /dev/null)
-        if ps -p $server_pid > /dev/null 2>&1; then
+        if [ -z "$server_pid" ] ; then
+            continue
+        fi
+        if $RUN_SUDO kill -0 $server_pid > /dev/null 2>&1; then
             servers_up=$(( $servers_up + 1 ))
         fi
     done
diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh
index e5906eec..32f0362d 100755
--- a/tests/t_server_null_server.sh
+++ b/tests/t_server_null_server.sh
@@ -82,6 +82,11 @@  for PID_FILE in $server_pid_files
 do
     SERVER_PID=$(cat "${PID_FILE}")
 
+    if [ -z "$SERVER_PID" ] ; then
+        echo "WARNING: could not kill server ${PID_FILE}!"
+	continue
+    fi
+
     if [ -z "${RUN_SUDO}" ]; then
         $KILL_EXEC "${SERVER_PID}"
     else