From 05fd70e30fb7a7deb85e5af0051608d9bbabf821 Mon Sep 17 00:00:00 2001
From: corver <corver.roos@gmail.com>
Date: Mon, 23 Sep 2024 13:12:07 +0200
Subject: [PATCH] fix: batch write race on commit (#983)

(cherry picked from commit fe80f0ad3d64e9973eb0af56f0c0aaaba26dbee7)
---
 import.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/import.go b/import.go
index 56566feae..991324c59 100644
--- a/import.go
+++ b/import.go
@@ -213,7 +213,17 @@ func (i *Importer) Commit() error {
 			len(i.stack))
 	}
 
-	err := i.batch.WriteSync()
+	// Wait for previous batch.
+	var err error
+	if i.inflightCommit != nil {
+		err = <-i.inflightCommit
+		i.inflightCommit = nil
+	}
+	if err != nil {
+		return err
+	}
+
+	err = i.batch.WriteSync()
 	if err != nil {
 		return err
 	}