unsolo and tweak recovery

Author: mafintosh

lib/session-state.js

@@ -583,12 +583,20 @@ class SessionState {
         continue
       }
 
-      await new Promise((resolve) => setTimeout(resolve, 8000))
+      let restart = false
 
-      peers = getRecoveryPeers(replicator.peers)
+      for (let i = 0; i < 32; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 250))
 
-      if (peers.length < 1 || this.closing) continue
-      if (peers[0].remoteLength > this.length) continue
+        peers = getRecoveryPeers(replicator.peers)
+
+        if (this.closing || !validateRecoveryPeers(peers, this.length)) {
+          restart = true
+          break
+        }
+      }
+
+      if (restart) continue
 
       if (this.length !== length) {
         throw SESSION_NOT_WRITABLE('core recovered during append')
@@ -1310,3 +1318,19 @@ function getRecoveryPeers(peers) {
 
   return actual
 }
+
+function validateRecoveryPeers(peers, length) {
+  if (peers.length < 1) return false
+
+  for (const p of peers) {
+    if (p.remoteLength > length) return false
+  }
+
+  let all = true
+
+  for (const p of peers) {
+    if (p.remoteLength === 0) all = false
+  }
+
+  return all
+}

test/replicate.js

@@ -2887,7 +2887,7 @@ test('local writable caught up by remote', async function (t) {
   t.is(b.length, a.length)
 })
 
-test.solo('local recovering from remote', async function (t) {
+test('local recovering from remote', async function (t) {
   const a = await create(t)
 
   await a.append(['a', 'b', 'c', 'd', 'e'])