Skip to content

Commit a48146b

Browse files
committed
Crudely disable caching of outbound messages
1 parent 7c6fbf0 commit a48146b

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

hydra-node/src/Hydra/Network/Reliability.hs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,13 @@ import Cardano.Binary (serialize')
8686
import Cardano.Crypto.Util (SignableRepresentation (getSignableRepresentation))
8787
import Control.Concurrent.Class.MonadSTM (
8888
MonadSTM (readTQueue, writeTQueue),
89-
modifyTVar',
9089
newTQueueIO,
9190
newTVarIO,
9291
readTVarIO,
9392
writeTVar,
9493
)
9594
import Control.Tracer (Tracer)
9695
import Data.IntMap qualified as IMap
97-
import Data.Sequence.Strict ((|>))
9896
import Data.Sequence.Strict qualified as Seq
9997
import Data.Vector (
10098
Vector,
@@ -225,9 +223,8 @@ withReliability ::
225223
-- | Underlying network component providing consuming and sending channels.
226224
NetworkComponent m (Authenticated (ReliableMsg (Heartbeat inbound))) (ReliableMsg (Heartbeat outbound)) a ->
227225
NetworkComponent m (Authenticated (Heartbeat inbound)) (Heartbeat outbound) a
228-
withReliability tracer MessagePersistence{saveAcks, loadAcks, appendMessage, loadMessages} me otherParties withRawNetwork callback action = do
226+
withReliability tracer MessagePersistence{saveAcks, loadAcks, loadMessages} me otherParties withRawNetwork callback action = do
229227
acksCache <- loadAcks >>= newTVarIO
230-
-- FIXME: always growing
231228
sentMessages <- loadMessages >>= newTVarIO . Seq.fromList
232229
resendQ <- newTQueueIO
233230
let ourIndex = fromMaybe (error "This cannot happen because we constructed the list with our party inside.") (findPartyIndex me)
@@ -237,15 +234,19 @@ withReliability tracer MessagePersistence{saveAcks, loadAcks, appendMessage, loa
237234
reliableBroadcast sentMessages ourIndex acksCache network
238235
where
239236
allParties = fromList $ sort $ me : otherParties
240-
reliableBroadcast sentMessages ourIndex acksCache Network{broadcast} =
237+
238+
reliableBroadcast _sentMessages ourIndex acksCache Network{broadcast} =
241239
action $
242240
Network
243241
{ broadcast = \msg ->
244242
case msg of
245243
Data{} -> do
246-
localCounter <- atomically $ cacheMessage msg >> incrementAckCounter
247-
saveAcks localCounter
248-
appendMessage msg
244+
-- FIXME: No outbound message cache and persistence, resending will be broken
245+
localCounter <- atomically $ do
246+
-- cacheMessage msg
247+
incrementAckCounter
248+
-- saveAcks localCounter
249+
-- appendMessage msg
249250
traceWith tracer BroadcastCounter{ourIndex, localCounter}
250251
broadcast $ ReliableMsg localCounter msg
251252
Ping{} -> do
@@ -261,8 +262,8 @@ withReliability tracer MessagePersistence{saveAcks, loadAcks, appendMessage, loa
261262
writeTVar acksCache newAcks
262263
pure newAcks
263264

264-
cacheMessage msg =
265-
modifyTVar' sentMessages (|> msg)
265+
-- cacheMessage msg =
266+
-- modifyTVar' sentMessages (|> msg)
266267

267268
reliableCallback acksCache sentMessages resend ourIndex (Authenticated (ReliableMsg acknowledged payload) party) = do
268269
if length acknowledged /= length allParties

0 commit comments

Comments
 (0)