From e07f112c5a69e9928f39d260f8828ea6f8ed45b8 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Thu, 2 Dec 2021 10:24:58 +0000
Subject: [PATCH] Fix Orphaned Scores can crash into real scores with the same
 ScoreID. #511

---
 server/src/lib/jobs/deorphan-scores.ts | 31 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/server/src/lib/jobs/deorphan-scores.ts b/server/src/lib/jobs/deorphan-scores.ts
index 4a680d043..ed0a1459d 100644
--- a/server/src/lib/jobs/deorphan-scores.ts
+++ b/server/src/lib/jobs/deorphan-scores.ts
@@ -18,19 +18,24 @@ export async function DeoprhanScores() {
 	let success = 0;
 	let removed = 0;
 
-	await Promise.all(
-		orphans.map((or) =>
-			ReprocessOrphan(or, blacklist, logger).then((r) => {
-				if (r === null) {
-					removed++;
-				} else if (r === false) {
-					failed++;
-				} else {
-					success++;
-				}
-			})
-		)
-	);
+	for (const or of orphans) {
+		// We have to await like this to avoid mid-air race conditions,
+		// where two orphans attempt to deorphan to the same scoreID
+		// at the same time.
+		//
+		// See #511.
+
+		// eslint-disable-next-line no-await-in-loop
+		const r = await ReprocessOrphan(or, blacklist, logger);
+
+		if (r === null) {
+			removed++;
+		} else if (r === false) {
+			failed++;
+		} else {
+			success++;
+		}
+	}
 
 	logger.info(`Finished attempting deorphaning.`);