Add assertion to check g_currentDelivery* is unset before delivery

This commit is contained in:
Junhyun Shim 2022-07-28 01:14:14 +02:00
parent 631cca6560
commit 78ea2b40b6

View File

@ -1026,6 +1026,8 @@ ACTOR static void deliver(TransportData* self,
return; return;
} }
try { try {
ASSERT(g_currentDeliveryPeerAddress == NetworkAddressList());
ASSERT(!g_currentDeliverPeerAddressTrusted);
g_currentDeliveryPeerAddress = destination.addresses; g_currentDeliveryPeerAddress = destination.addresses;
g_currentDeliverPeerAddressTrusted = isTrustedPeer; g_currentDeliverPeerAddressTrusted = isTrustedPeer;
g_currentDeliveryPeerDisconnect = disconnect; g_currentDeliveryPeerDisconnect = disconnect;
@ -1033,11 +1035,11 @@ ACTOR static void deliver(TransportData* self,
ASSERT(data.size() > 8); ASSERT(data.size() > 8);
ArenaObjectReader objReader(reader.arena(), reader.arenaReadAll(), AssumeVersion(reader.protocolVersion())); ArenaObjectReader objReader(reader.arena(), reader.arenaReadAll(), AssumeVersion(reader.protocolVersion()));
receiver->receive(objReader); receiver->receive(objReader);
g_currentDeliveryPeerAddress = { NetworkAddress() }; g_currentDeliveryPeerAddress = NetworkAddressList();
g_currentDeliverPeerAddressTrusted = false; g_currentDeliverPeerAddressTrusted = false;
g_currentDeliveryPeerDisconnect = Future<Void>(); g_currentDeliveryPeerDisconnect = Future<Void>();
} catch (Error& e) { } catch (Error& e) {
g_currentDeliveryPeerAddress = { NetworkAddress() }; g_currentDeliveryPeerAddress = NetworkAddressList();
g_currentDeliverPeerAddressTrusted = false; g_currentDeliverPeerAddressTrusted = false;
g_currentDeliveryPeerDisconnect = Future<Void>(); g_currentDeliveryPeerDisconnect = Future<Void>();
TraceEvent(SevError, "ReceiverError") TraceEvent(SevError, "ReceiverError")