Skip to content

[SPARK-29999][SS][FOLLOWUP] Fix test to check the actual metadata log directory #28930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HeartSaVioR wants to merge 2 commits into from
Closed

[SPARK-29999][SS][FOLLOWUP] Fix test to check the actual metadata log directory #28930

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7e6b4e
[SPARK-29999][SS][FOLLOWUP] Fix test to check the actual metadata log…
HeartSaVioR Jun 26, 2020
8f949a1
Reflect review comment
HeartSaVioR Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSink.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ object FileStreamSink extends Logging {
val hdfsPath = new Path(singlePath)
val fs = hdfsPath.getFileSystem(hadoopConf)
if (fs.isDirectory(hdfsPath)) {
val metadataPath = new Path(hdfsPath, metadataDir)
checkEscapedMetadataPath(fs, metadataPath, sqlConf)
val metadataPath = getMetadataLogPath(hdfsPath, hadoopConf, sqlConf)
fs.exists(metadataPath)
} else {
false
Expand All @@ -55,6 +54,13 @@ object FileStreamSink extends Logging {
}
}

def getMetadataLogPath(path: Path, hadoopConf: Configuration, sqlConf: SQLConf): Path = {
val metadataDir = new Path(path, FileStreamSink.metadataDir)
val fs = metadataDir.getFileSystem(hadoopConf)

@cloud-fan cloud-fan Jun 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we pass the fs as a parameter as well?

FileStreamSink.checkEscapedMetadataPath(fs, metadataDir, sqlConf)

@cloud-fan cloud-fan Jun 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is new code. So this PR fixes a bug instead of just fixing a test?

@HeartSaVioR HeartSaVioR Jun 29, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry I should have explained before. That's to avoid test to copy same code (logic) what FileStreamSink does, so that we don't break the test when we somehow change it. So that's a refactor and doesn't mean there's a bug in FileStreamSink.

metadataDir
}

def checkEscapedMetadataPath(fs: FileSystem, metadataPath: Path, sqlConf: SQLConf): Unit = {
if (sqlConf.getConf(SQLConf.STREAMING_CHECKPOINT_ESCAPED_PATH_CHECK_ENABLED)
&& StreamExecution.containsSpecialCharsInPath(metadataPath)) {
Expand Down Expand Up @@ -125,14 +131,11 @@ class FileStreamSink(
partitionColumnNames: Seq[String],
options: Map[String, String]) extends Sink with Logging {

import FileStreamSink._

private val hadoopConf = sparkSession.sessionState.newHadoopConf()
private val basePath = new Path(path)
private val logPath = {
val metadataDir = new Path(basePath, FileStreamSink.metadataDir)
val fs = metadataDir.getFileSystem(hadoopConf)
FileStreamSink.checkEscapedMetadataPath(fs, metadataDir, sparkSession.sessionState.conf)
metadataDir
}
private val logPath = getMetadataLogPath(basePath, hadoopConf, sparkSession.sessionState.conf)
private val fileLog =
new FileStreamSinkLog(FileStreamSinkLog.VERSION, sparkSession, logPath.toString)

Expand Down
10 changes: 6 additions & 4 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSinkSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,12 @@ abstract class FileStreamSinkSuite extends StreamTest {
}
}

val fs = new Path(outputDir.getCanonicalPath).getFileSystem(
spark.sessionState.newHadoopConf())
val sinkLog = new FileStreamSinkLog(FileStreamSinkLog.VERSION, spark,
outputDir.getCanonicalPath)
val outputDirPath = new Path(outputDir.getCanonicalPath)
val hadoopConf = spark.sessionState.newHadoopConf()
val logPath = FileStreamSink.getMetadataLogPath(outputDirPath, hadoopConf, conf)
val fs = logPath.getFileSystem(hadoopConf)

val sinkLog = new FileStreamSinkLog(FileStreamSinkLog.VERSION, spark, logPath.toString)

val allFiles = sinkLog.allFiles()
// only files from non-empty partition should be logged
Expand Down