From d14d87b085ea4e06a54df2d361289915d1a0c5b2 Mon Sep 17 00:00:00 2001 From: Nitzan Mordechai Date: Wed, 28 Aug 2024 12:49:27 +0000 Subject: [PATCH] crimson/common/gated: Comment out ceph_assert for shard ID check After adding sid (shard ID) to Gated, each shard should have its own gate. However, some users of Gated had a single instance, which either failed these assertions or created the Gated object on the wrong shard. A tracker issue #67773 was opened for this, and this commit comments out the assertions until the issue is resolved. Signed-off-by: NitzanMordhai --- src/crimson/common/gated.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/common/gated.h b/src/crimson/common/gated.h index 28e3620e654..f7faef87970 100644 --- a/src/crimson/common/gated.h +++ b/src/crimson/common/gated.h @@ -31,13 +31,13 @@ class Gated { template inline void dispatch_in_background(const char* what, T& who, Func&& func) { - ceph_assert(seastar::this_shard_id() == sid); + //ceph_assert(seastar::this_shard_id() == sid); (void) dispatch(what, who, std::forward(func)); } template inline seastar::future<> dispatch(const char* what, T& who, Func&& func) { - ceph_assert(seastar::this_shard_id() == sid); + //ceph_assert(seastar::this_shard_id() == sid); return seastar::with_gate(pending_dispatch, std::forward(func) ).handle_exception([what, &who] (std::exception_ptr eptr) { if (*eptr.__cxa_exception_type() == typeid(system_shutdown_exception)) { @@ -58,7 +58,7 @@ class Gated { template auto simple_dispatch(const char* what, Func&& func) { - ceph_assert(seastar::this_shard_id() == sid); + //ceph_assert(seastar::this_shard_id() == sid); return seastar::with_gate(pending_dispatch, std::forward(func)); } -- 2.39.5