wait properly

Author: d-w-moore

irods/test/harness/003_compile-specific-python.Dockerfile

@@ -13,4 +13,5 @@ RUN make install
 WORKDIR /
 RUN /root/python/bin/python3 -m pip install virtualenv
 RUN chmod a+rx /root
+COPY manage_irods5_procs /
 ENV PYTHON_VERSION=${python_version}

irods/test/harness/manage_irods5_procs

@@ -4,31 +4,54 @@ else
   LAUNCH='sudo su - irods -c'
 fi
 
+STDOUT=""
+PID=""
+
 start() {
-  $LAUNCH 'irodsServer -d -p /tmp/irods.pid'
+  if [ -z "$STDOUT" ] ; then
+    $LAUNCH 'irodsServer -d -p /tmp/irods.pid'
+  else
+    $LAUNCH 'irodsServer --stdout -p /tmp/irods.pid >/tmp/irods.log &'
+  fi
 }
 
-stop() { 
-  $LAUNCH 'kill -QUIT $(cat /tmp/irods.pid) ; rm -f /tmp/irods.pid >/dev/null 2>&1'
+rm_pid_file() {
+  if [ -z "$PID" ]; then
+      PID=$($LAUNCH 'cat /tmp/irods.pid')
+  fi
+  $LAUNCH 'rm -f /tmp/irods.pid >/dev/null 2>&1'
 }
 
-if [ "$1" = "start" ]; then
-  start
-elif [ "$1" = "start-bg" ]; then
-  $LAUNCH 'irodsServer --stdout -p /tmp/irods.pid >/tmp/irods.log &'
-elif [ "$1" = "rescan-config" ]; then
-  $LAUNCH 'pkill -HUP irodsServer'
-elif [ "$1" = "status" ]; then
-  pgrep -afl "irods(Delay|Agent|Server)"
-elif [ "$1" = "stop" ]; then
-  stop
-elif [ "$1" = "restart" ]; then
-  stop && start
-elif [ "$1" = "wait" ]; then
-  $LAUNCH '
-      pid=`cat /tmp/irods.pid 2>/dev/null`;
-      [ -n "$pid" ] && { while ps -eo pid |grep $pid >/dev/null 2>&1; do sleep 1; done; }'
-else
-  echo >&2 "usage: $0 [start|status|stop]"
-  exit 2
-fi
+stop() {
+  $LAUNCH 'kill -QUIT $(cat /tmp/irods.pid)'
+  rm_pid_file
+}
+
+wait() {
+  $LAUNCH "
+      [ -z '$PID' ] && { echo >&2 'nothing to wait for.' ; exit 2; }
+      while ps -eo pid |grep $PID >/dev/null 2>&1; do sleep 1; done;"
+}
+
+# -----------------------------------
+while [ -n "$1" ]; do
+    if [ "$1" = "stdout" ]; then
+      STDOUT=1
+     elif [ "$1" = "start" ]; then
+       start
+     elif [ "$1" = "rescan-config" ]; then
+       $LAUNCH 'pkill -HUP irodsServer'
+    elif [ "$1" = "status" ]; then
+      pgrep -afl "irods(Delay|Agent|Server)"
+    elif [ "$1" = "stop" ]; then
+      stop
+    elif [ "$1" = "restart" ]; then
+      stop && start
+    elif [ "$1" = "wait" ]; then
+      wait
+    else
+      echo >&2 "usage: $0 [start|status|stop]"
+      exit 2
+    fi
+    shift
+done

irods/test/harness/setup_python_rule_engine

@@ -12,7 +12,11 @@ DIR=$(dirname "$0")
 
 server_ctl() {
     if "$DIR"/irods_version_greater_or_equal_to --use_env_var=IRODS_PACKAGE_VERSION 5.0; then
-        /manage_irods5_procs $1
+        W=""
+        if [ "$1" = stop ]; then
+          W=wait
+        fi
+        /manage_irods5_procs $1 $W
     else
         ~/irodsctl $1
     fi
@@ -72,8 +76,9 @@ server_ctl start
 
 if [ -n "$wait" ]; then
     times=0
+    OUTFILE=/tmp/irule_output.stderr
     while :; do
-        irule -a | grep "irods_rule_engine_plugin-python-instance" >/dev/null 2>&1
+        irule -a 2>/dev/null| grep irods_rule_engine_plugin-python-instance >/dev/null
         [ ${PIPESTATUS[1]} -eq 0 ] && break
         sleep 1
         if [ $((++times)) -ge 10 ]; then