Merge cockroachdb#103834

103834: c2c: dont swallow pts update error r=stevendanna a=msbutler c2c: dont swallow pts update error Fixes cockroachdb#103015 Release note: none Co-authored-by: Michael Butler <[email protected]>
miraradeva · May 26, 2023 · c6255a1 · c6255a1
2 parents 880672c + 7684fa0
commit c6255a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_frontier_processor.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_frontier_processor.go
@@ -289,15 +289,15 @@ func (sf *streamIngestionFrontier) Next() (
 			break
 		}
 
-		var err error
-		if _, err = sf.noteResolvedTimestamps(row[0]); err != nil {
+		if _, err := sf.noteResolvedTimestamps(row[0]); err != nil {
 			sf.MoveToDraining(err)
 			break
 		}
 
 		if err := sf.maybeUpdatePartitionProgress(); err != nil {
-			// Updating the partition progress isn't a fatal error.
 			log.Errorf(sf.Ctx(), "failed to update partition progress: %+v", err)
+			sf.MoveToDraining(err)
+			break
 		}
 
 		// Send back a row to the job so that it can update the progress.