Skip to content

Commit e9291d6

Browse files
committed
chore: add comment on cancel
1 parent 2d4638e commit e9291d6

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/handler.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function handle ({ context, logger, batchSize = config.blocksBatchSize }) {
5656
const normalizedWantlist = getNormalizedWantlist(wantlist, context, logger)
5757

5858
// Set state of processing blocks in canceled state
59-
updateCanceledState(normalizedWantlist, context)
59+
updateCanceledState(normalizedWantlist, context, logger)
6060

6161
process.nextTick(async () => {
6262
// catch async error in libp2p connection
@@ -186,7 +186,11 @@ async function batchResponse ({ blocks, context, logger }) {
186186
let message = new Message()
187187
for (let i = 0; i < blocks.length; i++) {
188188
const block = blocks[i]
189+
// console.log('block key', block.key)
189190
const canceledItem = context.canceled.get(block.key)
191+
logger.info({ keyList: context.canceled.keyList }, 'check keyList')
192+
logger.info({ key: block.key }, 'check')
193+
logger.info({ canceled: canceledItem }, 'canceled')
190194
if (!canceledItem || canceledItem !== block.type) {
191195
const size = messageSize[block.type](block)
192196

@@ -203,6 +207,7 @@ async function batchResponse ({ blocks, context, logger }) {
203207
telemetry.increaseLabelCount('bitswap-block-success-cancel', [block.type])
204208
telemetry.increaseLabelCount('bitswap-cancel-size', [block.type], size)
205209

210+
logger.info({ key: block.key }, 'delete')
206211
context.canceled.delete(block.key)
207212
}
208213
}
@@ -217,22 +222,27 @@ async function batchResponse ({ blocks, context, logger }) {
217222
}
218223
}
219224

220-
function updateCanceledState (wantList, context) {
225+
function updateCanceledState (wantList, context, logger) {
221226
const { wantedBlocks, wantedHave, canceled } = wantList
222227

223228
// Removed previous canceled blocks
224229
wantedBlocks.forEach(block => {
230+
logger.info({ key: block.key }, 'remove block from canceled')
225231
context.canceled.delete(block.key)
226232
})
227233

228234
wantedHave.forEach(block => {
235+
logger.info({ key: block.key }, 'remove wanted block from canceled')
229236
context.canceled.delete(block.key)
230237
})
231238

232239
// Add new canceled blocks
233240
canceled.forEach(block => {
241+
logger.info({ key: block.key }, 'add block to canceled')
234242
context.canceled.set(block.key, block.wantType)
235243
})
244+
245+
logger.info({ keyList: context.canceled.keyList }, 'check keyList')
236246
}
237247

238248
// end response, close connection

src/service.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,14 @@ async function startService ({ peerId, port, peerAnnounceAddr, awsClient, connec
146146
// another multiplexed stream.
147147
connection.on('end:receive', () => {
148148
// GC canceled LRU on finish
149-
canceled.clear()
149+
// canceled.clear()
150+
logger.info({}, 'end:receive')
150151
connection.close()
151152
})
152153

153154
connection.on('error', err => {
154155
// GC canceled LRU on error
156+
logger.info({}, 'error')
155157
canceled.clear()
156158
logger.error({ err, dial, stream, protocol }, 'Connection error')
157159
})

0 commit comments

Comments
 (0)