modify error test for conflicts across engines

pingcap · Feb 18, 2024 · df67d8d · df67d8d
1 parent 0dadb83
commit df67d8d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/br/pkg/lightning/errormanager/errormanager.go b/br/pkg/lightning/errormanager/errormanager.go
@@ -794,7 +794,9 @@ func (em *ErrorManager) ResolveConflictKeysError(
 		if err := kvRows.Scan(&kvRowsCount); err != nil {
 			return errors.Trace(err)
 		}
-
+	}
+	if err := kvRows.Err(); err != nil {
+		return errors.Trace(err)
 	}
 
 	em.logger.Debug("got kv rows count from table",
@@ -817,6 +819,9 @@ func (em *ErrorManager) ResolveConflictKeysError(
 				logutil.Key("raw_key", rawKey),
 				zap.Binary("raw_row", rawRow))
 		}
+		if err := rows.Err(); err != nil {
+			return errors.Trace(err)
+		}
 		return common.ErrFoundDuplicateKeys.FastGenByArgs(rawKey, rawRow)
 	}
 	return nil