From 3d3c4f9daa31e0d1e8c066f7472840553a98b22d Mon Sep 17 00:00:00 2001 From: Leonid Chernin Date: Tue, 10 Dec 2024 19:31:45 +0000 Subject: [PATCH] fix tests: 4gw_create-delete Signed-off-by: Leonid Chernin --- ceph-nvmeof.conf | 2 +- tests/ha/4gws_create_delete.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ceph-nvmeof.conf b/ceph-nvmeof.conf index 9b63dc52..ea3c9c08 100644 --- a/ceph-nvmeof.conf +++ b/ceph-nvmeof.conf @@ -17,7 +17,7 @@ state_update_notify = True state_update_timeout_in_msec = 2000 state_update_interval_sec = 5 enable_spdk_discovery_controller = False -rebalance_period_sec = 0 +rebalance_period_sec = 7 max_gws_in_grp = 16 max_ns_to_change_lb_grp = 8 #omap_file_lock_duration = 20 diff --git a/tests/ha/4gws_create_delete.sh b/tests/ha/4gws_create_delete.sh index 527d3593..2133f3cd 100755 --- a/tests/ha/4gws_create_delete.sh +++ b/tests/ha/4gws_create_delete.sh @@ -133,7 +133,7 @@ validate_all_active() { NUM_SUBSYSTEMS=2 NUM_GATEWAYS=4 FAILING_GATEWAYS=2 -NUM_OPTIMIZED=2 +NUM_OPTIMIZED=1 # # Step 1 validate all gateways are optimized for one of ANA group # and all groups are unique @@ -156,10 +156,11 @@ for i in $(seq 0 $(expr $FAILING_GATEWAYS - 1)); do echo 📫 nvme-gw delete gateway: \'$gw_name\' pool: \'$POOL\', group: \'\' \(empty string\) docker compose exec -T ceph ceph nvme-gw delete $gw_name $POOL '' done - +sleep 100 # wait for scale down rebalance complete docker ps -# expect remaining gws to have two optimized groups each +# expect remaining gws to have 1 optimized groups each because +# due to scale down rebalance 2 deleted gws and 2 ANA groups were removed from the monitor's database for i in $(seq 4); do found=0 for j in $(seq 0 $(expr $FAILING_GATEWAYS - 1)); do