From 46aa59fe4995820ae14ec4818bc73b704cfbd663 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 5 Sep 2025 09:56:21 +0300 Subject: [PATCH] Revert "gossiper: check for a race condition in `do_apply_state_locally`" This reverts commit 13392a40d4d7dc60cd07b9de5cfe4d5b1651fe5d as per request from #25803 --- gms/gossiper.cc | 7 ------- test/cluster/test_gossiper_race.py | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gms/gossiper.cc b/gms/gossiper.cc index 29cad26441..7392bf27e1 100644 --- a/gms/gossiper.cc +++ b/gms/gossiper.cc @@ -621,13 +621,6 @@ future<> gossiper::do_apply_state_locally(locator::host_id node, endpoint_state // If there is a generation tie, attempt to break it by heartbeat version. auto permit = co_await lock_endpoint(node, null_permit_id); auto es = get_endpoint_state_ptr(node); - - // If remote state update does not contain a host id, check whether the endpoint still - // exists in the `_endpoint_state_map` since after a preemption point it could have been deleted. - if (!remote_state.get_host_id() && !es) { - throw std::runtime_error(format("Entry for host id {} does not exist in the endpoint state map.", node)); - } - if (es) { endpoint_state local_state = *es; auto local_generation = local_state.get_heart_beat_state().get_generation(); diff --git a/test/cluster/test_gossiper_race.py b/test/cluster/test_gossiper_race.py index 18112fd3a1..1eae59be18 100644 --- a/test/cluster/test_gossiper_race.py +++ b/test/cluster/test_gossiper_race.py @@ -15,6 +15,7 @@ from test.pylib.manager_client import ManagerClient @pytest.mark.asyncio @skip_mode('release', 'error injections are not supported in release mode') +@pytest.mark.xfail(reason="https://github.com/scylladb/scylladb/issues/25621") async def test_gossiper_race_on_decommission(manager: ManagerClient): """ Test for gossiper race scenario (https://github.com/scylladb/scylladb/issues/25621):