NO MERGE: add verbose flag to ovsdb-client wait

Signed-off-by: Martin Kalcok <[email protected]>
canonical · Oct 22, 2024 · 8b4e5bb · 8b4e5bb
1 parent d3cc737
commit 8b4e5bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/tests/test_helper/bats/upgrade.bats b/tests/test_helper/bats/upgrade.bats
@@ -25,8 +25,16 @@ setup() {
         if [[ "$container_services" != *"central"* ]]; then
             continue
         fi
-        microovn_wait_ovndb_state "$container" nb connected 15
-        microovn_wait_ovndb_state "$container" sb connected 15
+        echo "# Checking NB DB state on $container" >&3
+        echo "# -------------------------------------------------------------------------------------" >&3
+        run lxc_exec "$container" "journalctl --no-tail  -u snap.microovn.ovn-ovsdb-server-nb | tee"
+        microovn_wait_ovndb_state "$container" nb connected 30
+        echo "# $output" >&3
+        echo "# Checking SB DB state on $container" >&3
+        echo "# -------------------------------------------------------------------------------------" >&3
+        microovn_wait_ovndb_state "$container" sb connected 30
+        run lxc_exec "$container" "journalctl --no-tail  -u snap.microovn.ovn-ovsdb-server-sb | tee"
+        echo "# $output" >&3
     done
 
     perform_manual_upgrade_steps $TEST_CONTAINERS

diff --git a/tests/test_helper/microovn.bash b/tests/test_helper/microovn.bash
@@ -238,7 +238,7 @@ function microovn_wait_ovndb_state() {
     schema_name=$(_ovn_schema_name "$nbsb")
 
     lxc_exec "$container" \
-        "timeout ${timeout} microovn.ovsdb-client wait \
+        "microovn.ovsdb-client -t ${timeout} -v wait \
          unix:/var/snap/microovn/common/run/ovn/ovn${nbsb}_db.sock \
          ${schema_name} ${state}"
 }