unset inflight blocks

Author: mafintosh

lib/replicator.js

@@ -354,6 +354,10 @@ class Peer {
     else this.sendSync()
   }
 
+  _markInflight (index) {
+    this.missingBlocks.set(index, false)
+  }
+
   broadcastRange (start, length, drop) {
     if (drop) this._unclearLocalRange(start, length)
     else this._clearLocalRange(start, length)
@@ -638,11 +642,12 @@ class Peer {
   }
 
   _cancelRequest (id) {
-    const exists = this.replicator._inflight.get(id)
-    if (!exists) return
+    const req = this.replicator._inflight.get(id)
+    if (!req) return
 
     this.inflight--
     this.replicator._removeInflight(id)
+    if (isBlockRequest(req)) this.replicator._unmarkInflight(req.block.index)
 
     this.wireCancel.send({ request: id })
   }
@@ -692,6 +697,8 @@ class Peer {
       if (reorg === true) return await this.replicator._onreorgdata(this, req, data)
     } catch (err) {
       safetyCatch(err)
+      if (isBlockRequest(req)) this.replicator._unmarkInflight(req.block.index)
+
       this.paused = true
       this.replicator.oninvalid(err, req, data, this)
       return
@@ -706,6 +713,7 @@ class Peer {
       }
     } catch (err) {
       safetyCatch(err)
+      if (isBlockRequest(req)) this.replicator._unmarkInflight(req.block.index)
 
       if (err.code === 'WRITE_FAILED') {
         // For example, we don't want to keep pulling data when storage is full
@@ -795,9 +803,13 @@ class Peer {
     }
   }
 
+  _resetMissingBlock (index) {
+    this.missingBlocks.set(index, this._remoteHasBlock(index) && !this.core.bitfield.get(index))
+  }
+
   _unclearLocalRange (start, length) {
     if (length === 1) {
-      this.missingBlocks.set(start, this._remoteHasBlock(start) && !this.core.bitfield.get(start))
+      this._resetMissingBlock(start)
       return
     }
 
@@ -1010,6 +1022,14 @@ class Peer {
     return index < this._remoteContiguousLength || this.remoteBitfield.get(index) === true
   }
 
+  _sendBlockRequest (req, b) {
+    req.block = { index: b.index, nodes: 0 }
+    this.replicator._markInflight(b.index)
+
+    b.inflight.push(req)
+    this._send(req)
+  }
+
   _requestBlock (b) {
     const { length, fork } = this.core.tree
 
@@ -1025,10 +1045,7 @@ class Peer {
     const req = this._makeRequest(b.index >= length, b.priority)
     if (req === null) return false
 
-    req.block = { index: b.index, nodes: 0 }
-
-    b.inflight.push(req)
-    this._send(req)
+    this._sendBlockRequest(req, b)
 
     return true
   }
@@ -1047,10 +1064,7 @@ class Peer {
       return false
     }
 
-    req.block = { index, nodes: 0 }
-
-    b.inflight.push(req)
-    this._send(req)
+    this._sendBlockRequest(req, b)
 
     // Don't think this will ever happen, as the pending queue is drained before the range queue
     // but doesn't hurt to check this explicitly here also.
@@ -1552,11 +1566,14 @@ module.exports = class Replicator {
     this.onpeerupdate(true, peer)
   }
 
+  _markInflight (index) {
+    for (const peer of this.peers) peer._markInflight(index)
+  }
+
   _removeInflight (id) {
     this._inflight.remove(id)
-    if (this.isDownloading() === false) {
-      for (const peer of this.peers) peer.signalUpgrade()
-    }
+    if (this.isDownloading() === true) return
+    for (const peer of this.peers) peer.signalUpgrade()
   }
 
   _removePeer (peer) {
@@ -1759,6 +1776,7 @@ module.exports = class Replicator {
   _clearRequest (peer, req) {
     if (req.block !== null) {
       this._clearInflightBlock(this._blocks, req)
+      this._unmarkInflight(req.block.index)
     }
 
     if (req.hash !== null) {
@@ -1783,6 +1801,10 @@ module.exports = class Replicator {
     this.updateAll()
   }
 
+  _unmarkInflight (index) {
+    for (const peer of this.peers) peer._resetMissingBlock(index)
+  }
+
   _ondata (peer, req, data) {
     if (data.block !== null) {
       this._resolveBlockRequest(this._blocks, data.block.index, data.block.value, req)
@@ -2218,3 +2240,7 @@ function onwireextension (m, c) {
 function setDownloadingLater (repl, downloading, session) {
   repl.setDownloadingNow(downloading, session)
 }
+
+function isBlockRequest (req) {
+  return req !== null && req.block !== null
+}