From: Martin Schwenke <mschwenke@ddn.com>
Date: Wed, 12 Jul 2023 00:39:06 +0000 (+1000)
Subject: ctdb-tools: Always print script output in event status
X-Git-Tag: ldb-2.8.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c0b72c340f86b1d6e4fd009d1082c7e477fd04;p=thirdparty%2Fsamba.git

ctdb-tools: Always print script output in event status

When event scripts succeed they generally produce no output.  However,
when a script succeeds and produces output, such output almost
certainly contains warnings.  So, always print script output.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c
index 46dc25e6c30..5e94af1d9bc 100644
--- a/ctdb/event/event_tool.c
+++ b/ctdb/event/event_tool.c
@@ -197,7 +197,8 @@ static void print_status_one(struct ctdb_event_script *script)
 		       ctime(&script->begin.tv_sec));
 	}
 
-	if (script->result != 0 && script->result != -ENOEXEC) {
+	if ((script->result != 0 && script->result != -ENOEXEC) ||
+	    script->output != NULL) {
 		printf("  OUTPUT: %s\n",
 		       script->output == NULL ? "" : script->output);
 	}
diff --git a/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script
index f25e7242543..a59c58bf692 100755
--- a/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script
+++ b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script
@@ -5,7 +5,27 @@ case "$1" in
 "failure") exit 1 ;;
 "timeout") sleep 99 ;;
 "verbose") echo "Running event $1" ; exit 0 ;;
+"verbosemultiline")
+	cat <<EOF
+Running event $1
+There are multiple output lines
+
+^^^ including blank lines...
+
+EOF
+	exit 0
+	;;
 "verbosefailure") echo "args: $*"; exit 1 ;;
+"verbosemultilinefailure")
+	cat <<EOF
+Failing event $1
+There are multiple output lines
+
+args: $*
+
+EOF
+	exit 2
+	;;
 "verbosetimeout") echo "Sleeping for 99 seconds"; sleep 99 ;;
 "verbosetimeout2") echo "Sleeping for 99 seconds"; sleep 99 ;;
 *) exit 0 ;;
diff --git a/ctdb/tests/UNIT/eventd/eventd_008.sh b/ctdb/tests/UNIT/eventd/eventd_008.sh
index c394f61790b..f2e3cb1dbee 100755
--- a/ctdb/tests/UNIT/eventd/eventd_008.sh
+++ b/ctdb/tests/UNIT/eventd/eventd_008.sh
@@ -17,3 +17,41 @@ required_result 1 <<EOF
   OUTPUT: args: verbosefailure with some args
 EOF
 simple_test status random verbosefailure
+
+ok_null
+simple_test run 10 random verbose
+
+ok <<EOF
+01.disabled          DISABLED  
+02.enabled           OK         DURATION DATETIME
+  OUTPUT: Running event verbose
+EOF
+simple_test status random verbose
+
+ok_null
+simple_test run 10 random verbosemultiline
+
+ok <<EOF
+01.disabled          DISABLED  
+02.enabled           OK         DURATION DATETIME
+  OUTPUT: Running event verbosemultiline
+There are multiple output lines
+
+^^^ including blank lines...
+EOF
+simple_test status random verbosemultiline
+
+required_result 8 <<EOF
+Event verbosemultilinefailure in random failed
+EOF
+simple_test run 10 random verbosemultilinefailure with some args
+
+required_result 2 <<EOF
+01.disabled          DISABLED  
+02.enabled           ERROR      DURATION DATETIME
+  OUTPUT: Failing event verbosemultilinefailure
+There are multiple output lines
+
+args: verbosemultilinefailure with some args
+EOF
+simple_test status random verbosemultilinefailure