From e86f416f0ac3bce840c364c53a34ab05ab05edac Mon Sep 17 00:00:00 2001
From: Barak Amar <barak.amar@treeverse.io>
Date: Sun, 6 Dec 2020 18:54:49 +0200
Subject: [PATCH] bug fix merge apply diff closed on error channel (#1007)

---
 catalog/mvcc/cataloger_merge.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/catalog/mvcc/cataloger_merge.go b/catalog/mvcc/cataloger_merge.go
index cfb4054041f..10942345e05 100644
--- a/catalog/mvcc/cataloger_merge.go
+++ b/catalog/mvcc/cataloger_merge.go
@@ -128,7 +128,9 @@ func (c *cataloger) doMerge(ctx context.Context, tx db.Tx, params doDiffParams,
 				}
 			}
 		case err := <-errChan:
-			return rowsCounter, err
+			if err != nil {
+				return rowsCounter, err
+			}
 		}
 	}
 }