From 01d9aeb9a69efe9105aa6ebf15096a36c2eed8d4 Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Mon, 21 Aug 2017 16:49:54 +0100 Subject: [PATCH] Make upgrade verification errors more descriptive for 3.6 Signed-off-by: Gerhard Lazu --- upgrade/scripts/upgrade-to-3.6-helpers.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/upgrade/scripts/upgrade-to-3.6-helpers.sh b/upgrade/scripts/upgrade-to-3.6-helpers.sh index 4fd8866691..fe5a88882f 100644 --- a/upgrade/scripts/upgrade-to-3.6-helpers.sh +++ b/upgrade/scripts/upgrade-to-3.6-helpers.sh @@ -30,8 +30,13 @@ verify_steps() { ./rabbitmqadmin -u $test_user -p $test_user -V $test_vhost list queues name durable | \ grep $queue_name | grep True # Each queue have $MSGS_COUNT_PERSISTENT_INDEX + $MSGS_COUNT_PERSISTENT_STORE messages - ./rabbitmqadmin -u $test_user -p $test_user -V $test_vhost list queues name messages | \ - grep $queue_name | grep `expr $MSGS_COUNT_PERSISTENT_INDEX + $MSGS_COUNT_PERSISTENT_STORE` + queue_with_message_counts="$(./rabbitmqadmin -u "$test_user" -p "$test_user" -V "$test_vhost" list queues name messages | grep "$queue_name")" + number_of_messages="$((MSGS_COUNT_PERSISTENT_INDEX + MSGS_COUNT_PERSISTENT_STORE))" + if [[ ! $queue_with_message_counts =~ $number_of_messages ]] + then + echo "Expected $queue_with_message_counts to contain $number_of_messages" + exit 1 + fi # Drain persistent messages from queue index for j in `seq 1 $MSGS_COUNT_PERSISTENT_INDEX`