File bug-987348-pacemaker-ping-avoid-temporary-files... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File bug-987348-pacemaker-ping-avoid-temporary-files-fping-1.patch of Package pacemaker (Revision c1b86008d634e234fbc7b05b700235d2)

Currently displaying revision c1b86008d634e234fbc7b05b700235d2 , Show latest

commit a7373f9201649150f20b0c30b8751a2faba357e4
Author: Kristoffer Grönlund <krig@koru.se>
Date:   Wed Aug 10 22:24:00 2016 +0200

Low: ping: Avoid temp files in fping_check  (bsc#987348)
    
    Unfortunately the previous attempt to avoid this issue (commit
    7eb958ce4) didn't work since the problem happens only when the
    output buffer is flushed but the write fails. Since there is no
    mechanism in the shell to check if a pipe write is successful,
    this silently fails.
    
    In ping_check, there are no temporary files created. It's
    possible to avoid the temporaries for fping too, but I had to
    resort to using python.

diff --git a/extra/resources/ping b/extra/resources/ping
index 76a45a8..4ddf6bd 100755
--- a/extra/resources/ping
+++ b/extra/resources/ping
@@ -241,34 +241,49 @@ fping_check() {
         99) ocf_log err "Ambiguous IP versions in host_list: '$OCF_RESKEY_host_list'"; exit $OCF_ERR_CONFIGURED;;
     esac
 
-    active=0
-    f_out=`mktemp`
-    f_err=`mktemp`
-    if [ ! -f "$f_out" ] || [ ! -f "$f_err" ]; then
-        ocf_log err "Failed to create temporary files for fping output; is /tmp full?"
-        exit $OCF_ERR_PERM
-    fi
-
-    n=$OCF_RESKEY_attempts
-    timeout=`expr $OCF_RESKEY_timeout \* 1000 / $OCF_RESKEY_attempts`
-
-    cmd="$p_exe -r $OCF_RESKEY_attempts -t $timeout -B 1.0 $OCF_RESKEY_options $OCF_RESKEY_host_list"
-    $cmd>$f_out 2>$f_err; rc=$?
-    active=`grep alive $f_out|wc -l`
+    outp=$(python <<EOF
+from __future__ import print_function
+import subprocess
+import sys
+extra_opts="$OCF_RESKEY_options".split()
+opts = [
+    "$p_exe",
+    "-r", "$OCF_RESKEY_attempts",
+    "-t", str($OCF_RESKEY_timeout * 1000 / $OCF_RESKEY_attempts),
+    "-B", "1.0"
+]
+hostlist="$OCF_RESKEY_host_list".split()
+cmd = opts + extra_opts + hostlist
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+stdout, stderr = p.communicate()
+rc = p.returncode
+for line in stdout.splitlines():
+    if "alive" in line:
+        print(line)
+if rc == 1:
+    for line in stdout.splitlines():
+        if "unreachable" in line:
+            print(line.split()[0], "is inactive")
+elif rc != 0:
+    print("Unexpected result for", " ".join(cmd), rc, ": ", stderr.replace('\n', ';'))
+sys.exit(rc)
+EOF
+        )
+    rc=$?
+    active=$(echo "$outp" | grep alive | wc -l)
 
     case $rc in
- 	0) 
-	    ;;
- 	1) 
-	    for h in `grep unreachable $f_out | awk '{print $1}'`; do
-		ping_conditional_log warn "$h is inactive"
-	    done
-	    ;;
- 	*) 
-	    ocf_log err "Unexpected result for '$cmd' $rc: `tr '\n' ';' < $f_err`"
-	    ;;
+    0)
+        ;;
+    1)
+        echo "$outp" | grep inactive | while read in; do
+            ping_conditional_log warn "$in"
+        done
+        ;;
+    *)
+        ocf_log err "$outp"
+        ;;
     esac
-    rm -f $f_out $f_err
 
     return $active
 }

Places

File bug-987348-pacemaker-ping-avoid-temporary-files-fping-1.patch of Package pacemaker (Revision c1b86008d634e234fbc7b05b700235d2)

Places