From 3357edc442b5a55fa7a961588eb7554fb4f74039 Mon Sep 17 00:00:00 2001 From: Alex Chi Z Date: Wed, 23 Apr 2025 16:03:55 -0400 Subject: [PATCH] drain instead of mark offline Signed-off-by: Alex Chi Z --- .../regress/test_storage_controller.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/test_runner/regress/test_storage_controller.py b/test_runner/regress/test_storage_controller.py index 320b6864d7..1e2c68a57c 100644 --- a/test_runner/regress/test_storage_controller.py +++ b/test_runner/regress/test_storage_controller.py @@ -4560,20 +4560,13 @@ def test_storage_controller_shard_scheduling_policy_essential(neon_env_builder: assert False, "unreachable" secondary_pageserver = 1 - primary_pageserver - # Ensure the tenant gets attached to the secondary pageserver - env.pageservers[primary_pageserver].stop() - env.storage_controller.node_configure( - env.pageservers[primary_pageserver].id, {"availability": "Offline"} - ) + # # Ensure the tenant gets attached to the secondary pageserver + # env.pageservers[primary_pageserver].stop() + # env.storage_controller.node_configure( + # env.pageservers[primary_pageserver].id, {"availability": "Offline"} + # ) + env.storage_controller.node_drain(env.pageservers[primary_pageserver].id) env.storage_controller.reconcile_until_idle() - assert ( - len( - env.pageservers[secondary_pageserver] - .http_client() - .tenant_list_locations()["tenant_shards"] - ) - == 1 - ) assert ( env.pageservers[secondary_pageserver] .http_client()