From: Martin Schwenke <martin@meltin.net>
Date: Sun, 5 May 2019 02:31:41 +0000 (+1000)
Subject: ctdb-tests: Add dump-logs command for local daemons
X-Git-Tag: tdb-1.4.1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a60e77157cb6e803ead4e93d1caeba140f955e08;p=thirdparty%2Fsamba.git

ctdb-tests: Add dump-logs command for local daemons

Dump a single merged log to stdout.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 3c3897feb50..8fbef1922b9 100755
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -399,6 +399,31 @@ local_daemons_print_socket ()
 	onnode -q "$_nodes" "${VALGRIND:-} ${_path} socket ctdbd"
 }
 
+local_daemons_dump_logs ()
+{
+	if [ $# -ne 1 ] || [ "$1" = "-h" ] ; then
+		local_daemons_generic_usage "dump-logs"
+	fi
+
+	_nodes="$1"
+	shift
+
+	onnode_common
+
+	# shellcheck disable=SC2016
+	# $CTDB_BASE must only be expanded under onnode, not in top-level shell
+	onnode -q "$_nodes" 'echo ${CTDB_BASE}/log.ctdb' |
+	while IFS='' read -r _l ; do
+		_dir=$(dirname "$_l")
+		_node=$(basename "$_dir")
+		# Add fake hostname after date and time, which are the
+		# first 2 words on each line
+		sed -e "s|^\\([^ ][^ ]* [^ ][^ ]*\\)|\\1 ${_node}|" "$_l"
+	done |
+	sort
+
+}
+
 usage ()
 {
 	cat <<EOF
@@ -410,6 +435,7 @@ Commands:
   stop           Stop specified daemon(s)
   onnode         Run a command in the environment of specified daemon(s)
   print-socket   Print the Unix domain socket used by specified daemon(s)
+  dump-logs      Dump logs for specified daemon(s) to stdout
 
 All commands use <directory> for daemon configuration
 
@@ -434,5 +460,6 @@ start) local_daemons_start "$@" ;;
 stop) local_daemons_stop "$@" ;;
 onnode) local_daemons_onnode "$@" ;;
 print-socket) local_daemons_print_socket "$@" ;;
+dump-logs) local_daemons_dump_logs "$@" ;;
 *) usage ;;
 esac