fix merge conflict (#323)

noamcohen97 · web-flow · commit e3dd964f66d4 · 2025-12-28T12:35:55.000+02:00
diff --git a/azkustoingest/internal/queued/queued.go b/azkustoingest/internal/queued/queued.go
@@ -228,11 +228,11 @@ func (i *Ingestion) UploadReaderToBlob(ctx context.Context, reader io.Reader, pr
 			if isSeekable {
 				_, err = seeker.Seek(0, io.SeekStart)
 				if err != nil {
-					return "", errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "could not seek the reader to the start: %s", err)
+					return "", 0, errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "could not seek the reader to the start: %s", err)
 				}
 				continue
 			}
-			return "", errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "reader does not support seeking, cannot retry: %v", err)
+			return "", 0, errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "reader does not support seeking, cannot retry: %v", err)
 		}
 
 		i.mgr.ReportStorageResourceResult(containerUri.Account(), true)

Original file line number	Diff line number	Diff line change
`@@ -228,11 +228,11 @@ func (i *Ingestion) UploadReaderToBlob(ctx context.Context, reader io.Reader, pr`
`228`	`228`	`if isSeekable {`
`229`	`229`	`_, err = seeker.Seek(0, io.SeekStart)`
`230`	`230`	`if err != nil {`
`231`		`- return "", errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "could not seek the reader to the start: %s", err)`
	`231`	`+ return "", 0, errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "could not seek the reader to the start: %s", err)`
`232`	`232`	`}`
`233`	`233`	`continue`
`234`	`234`	`}`
`235`		`- return "", errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "reader does not support seeking, cannot retry: %v", err)`
	`235`	`+ return "", 0, errors.ES(errors.OpFileIngest, errors.KLocalFileSystem, "reader does not support seeking, cannot retry: %v", err)`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`i.mgr.ReportStorageResourceResult(containerUri.Account(), true)`