summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-03-27 11:37:42 +1100
committerAmitay Isaacs <amitay@gmail.com>2012-04-13 14:51:13 +1000
commitea1c89566e1d9278810d382339f6b3a586c2bc59 (patch)
treefe62332534b8101ef726f822d0013e0cdad66ab1
parentdbe7fa9ff0a693db3ee86750211eb8b1049fc849 (diff)
downloadsamba-ea1c89566e1d9278810d382339f6b3a586c2bc59.tar.gz
samba-ea1c89566e1d9278810d382339f6b3a586c2bc59.tar.xz
samba-ea1c89566e1d9278810d382339f6b3a586c2bc59.zip
tests: Add regular expression parsing for hop_count_buckets
This fixes the test to check ctdb statistics output. Signed-off-by: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 98c633ab4824e0e4d28ab2eb2532e16eb859bd94)
-rwxr-xr-xctdb/tests/simple/14_ctdb_statistics.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/simple/14_ctdb_statistics.sh b/ctdb/tests/simple/14_ctdb_statistics.sh
index e9ecce5892..76c520caf4 100755
--- a/ctdb/tests/simple/14_ctdb_statistics.sh
+++ b/ctdb/tests/simple/14_ctdb_statistics.sh
@@ -33,7 +33,7 @@ set -e
cluster_is_healthy
-pattern='^(CTDB version 1|Current time of statistics[[:space:]]*:.*|Statistics collected since[[:space:]]*:.*|Gathered statistics for [[:digit:]]+ nodes|[[:space:]]+[[:alpha:]_]+[[:space:]]+[[:digit:]]+|[[:space:]]+(node|client|timeouts)|[[:space:]]+([[:alpha:]_]+_latency|max_reclock_[[:alpha:]]+)[[:space:]]+[[:digit:]-]+\.[[:digit:]]+[[:space:]]sec|[[:space:]]*(reclock_ctdbd|reclock_recd|call_latency|lockwait_latency|childwrite_latency)[[:space:]]+MIN/AVG/MAX[[:space:]]+[-.[:digit:]]+/[-.[:digit:]]+/[-.[:digit:]]+ sec out of [[:digit:]]+)$'
+pattern='^(CTDB version 1|Current time of statistics[[:space:]]*:.*|Statistics collected since[[:space:]]*:.*|Gathered statistics for [[:digit:]]+ nodes|[[:space:]]+[[:alpha:]_]+[[:space:]]+[[:digit:]]+|[[:space:]]+(node|client|timeouts)|[[:space:]]+([[:alpha:]_]+_latency|max_reclock_[[:alpha:]]+)[[:space:]]+[[:digit:]-]+\.[[:digit:]]+[[:space:]]sec|[[:space:]]*(reclock_ctdbd|reclock_recd|call_latency|lockwait_latency|childwrite_latency)[[:space:]]+MIN/AVG/MAX[[:space:]]+[-.[:digit:]]+/[-.[:digit:]]+/[-.[:digit:]]+ sec out of [[:digit:]]+|[[:space:]]+hop_count_buckets:[[:space:][:digit:]]+)$'
try_command_on_node -v 1 "$CTDB statistics"