Skip to content

chore: add comment on cancel #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: add comment on cancel #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1f3aa
fix: cancel state at connection scope instead of stream
vasco-santos Mar 3, 2023
6d27e72
chore: add comment on cancel
vasco-santos Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,20 @@ async function batchResponse ({ blocks, context, logger }) {

try {
let message = new Message()
logger.info({ keyList: context.canceled.keyList }, 'check keyList')
for (let i = 0; i < blocks.length; i++) {
const block = blocks[i]
const canceledItem = context.canceled.get(block.key)

logger.info({ key: block.key, type: block.type, wantType: block.wantType }, 'check')
logger.info({ canceled: canceledItem }, 'canceled')

if (canceledItem === block.wantType) {
const size = messageSize[block.type](block)
telemetry.increaseLabelCount('bitswap-block-success-cancel', [block.type])
telemetry.increaseLabelCount('bitswap-cancel-size', [block.type], size)

logger.info({ key: block.key }, 'delete')
context.canceled.delete(block.key)
} else {
const size = messageSize[block.type](block)
Expand Down
15 changes: 12 additions & 3 deletions src/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ async function startService ({ peerId, port, peerAnnounceAddr, awsClient, connec
}
}

const cancelsPerPeer = new Map()
service.addEventListener('error', err => {
logger.warn({ err }, 'libp2p error event')
})
Expand All @@ -109,7 +110,7 @@ async function startService ({ peerId, port, peerAnnounceAddr, awsClient, connec
service.handle(protocol, async ({ connection: dial, stream }) => {
try {
const connection = new Connection(stream)
const canceled = new LRU({ max: 200 })
const canceled = cancelsPerPeer.get(dial.remotePeer.toString())

const hrTime = process.hrtime()
const connectionId = hrTime[0] * 1000000000 + hrTime[1]
Expand Down Expand Up @@ -161,20 +162,28 @@ async function startService ({ peerId, port, peerAnnounceAddr, awsClient, connec

// TODO move to networking
service.connectionManager.addEventListener('peer:connect', connection => {
cancelsPerPeer.set(
connection.detail.remotePeer.toString(),
new LRU({ max: 200 })
)

try {
telemetry.increaseCount('bitswap-connections')
telemetry.increaseGauge('bitswap-active-connections')
} catch (err) {
logger.warn({ err, remotePeer: connection.remotePeer }, 'Error while peer connecting')
logger.warn({ err, remotePeer: connection.detail.remotePeer.toString() }, 'Error while peer connecting')
}
})

// TODO move to networking
service.connectionManager.addEventListener('peer:disconnect', connection => {
cancelsPerPeer.delete(
connection.detail.remotePeer.toString()
)
try {
telemetry.decreaseGauge('bitswap-active-connections')
} catch (err) {
logger.warn({ err, remotePeer: connection.remotePeer }, 'Error while peer disconnecting')
logger.warn({ err, remotePeer: connection.detail.remotePeer.toString() }, 'Error while peer disconnecting')
}
})

Expand Down