bug fix merge apply diff closed on error channel

treeverse · Dec 6, 2020 · 17d001b · 17d001b
1 parent e88f3c7
commit 17d001b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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
+			}
 		}
 	}
 }