gaborgsomogyi commented on a change in pull request #26590: [SPARK-29953][SS]
Don't clean up source files for FileStreamSource if the files belong to the
output of FileStreamSink
URL: https://github.com/apache/spark/pull/26590#discussion_r350609593
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSource.scala
##########
@@ -267,10 +269,22 @@ class FileStreamSource(
val logOffset = FileStreamSourceOffset(end).logOffset
sourceCleaner.foreach { cleaner =>
- val files = metadataLog.get(Some(logOffset),
Some(logOffset)).flatMap(_._2)
- val validFileEntities = files.filter(_.batchId == logOffset)
- logDebug(s"completed file entries: ${validFileEntities.mkString(",")}")
- validFileEntities.foreach(cleaner.clean)
+ sourceHasMetadata match {
+ case Some(true) if !warnedIgnoringCleanSourceOption =>
+ logWarning("Ignoring 'cleanSource' option since source path refers
to the output" +
+ " directory of FileStreamSink.")
+ warnedIgnoringCleanSourceOption = true
+
+ case Some(false) =>
+ val files = metadataLog.get(Some(logOffset),
Some(logOffset)).flatMap(_._2)
+ val validFileEntities = files.filter(_.batchId == logOffset)
+ logDebug(s"completed file entries:
${validFileEntities.mkString(",")}")
+ validFileEntities.foreach(cleaner.clean)
+
+ case _ =>
+ logWarning("Ignoring 'cleanSource' option since Spark hasn't figured
out whether " +
Review comment:
Also not yet see which place is the suggestion refers to.
> L205, I'm not sure I follow
+1
L287: As I see this is more or less the `should never happen` case. The
question is whether we can consider edge cases which may hit this. If we miss a
valid case and we're throwing exception here we may block a query to start.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
