[SPARK-21596][SS]Ensure places calling HDFSMetadataLog.get check the return value #18799
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test build #80129 has finished for PR 18799 at commit
|
|
Test build #80138 has finished for PR 18799 at commit
|
zsxwing
commented
Aug 7, 2017
| @@ -123,7 +123,7 @@ class HDFSMetadataLog[T <: AnyRef : ClassTag](sparkSession: SparkSession, path: | |||
| serialize(metadata, output) | |||
| return Some(tempPath) | |||
| } finally { | |||
| IOUtils.closeQuietly(output) | |||
| output.close() | |||
There was a problem hiding this comment.
The output stream may fail to close (e.g., fail to flush the internal buffer), if it happens, we should fail the query rather than ignoring it.
tdas
reviewed
Aug 8, 2017
| val allLogs = validBatches.flatMap(batchId => super.get(batchId)).flatten ++ logs | ||
| val allLogs = validBatches.map { batchId => | ||
| super.get(batchId).getOrElse { | ||
| throw new IllegalStateException(s"batch $batchId doesn't exist") |
There was a problem hiding this comment.
what does it mean when this get return None? somehow the batch file is missing? is there anyway to improve the message any more?
tdas
reviewed
Aug 8, 2017
| getAllValidBatches(latestId, compactInterval).flatMap(id => super.get(id)).flatten | ||
| getAllValidBatches(latestId, compactInterval).map { id => | ||
| super.get(id).getOrElse { | ||
| throw new IllegalStateException(s"batch $id doesn't exist") |
There was a problem hiding this comment.
would be good give more context information. like latestId, etc.
tdas
reviewed
Aug 8, 2017
| @@ -396,6 +400,7 @@ object HDFSMetadataLog { | |||
|
|
|||
| /** | |||
| * Rename a path. Note that this implementation is not atomic. | |||
| * | |||
|
Test build #80370 has finished for PR 18799 at commit
|
tdas
reviewed
Aug 8, 2017
| // Verify that we can get all batches between `startId` and `endId`. | ||
| if (startId.isDefined || endId.isDefined) { | ||
| if (batchIds.isEmpty) { | ||
| throw new IllegalStateException(s"batch ${startId.orElse(endId).get} doesn't exist") |
There was a problem hiding this comment.
would be good to print the range that was asked for. otherwise its hard to see what was expected while debugging.
tdas
reviewed
Aug 8, 2017
| test("verifyBatchIds") { | ||
| import HDFSMetadataLog.verifyBatchIds | ||
| verifyBatchIds(Seq(1L, 2L, 3L), Some(1L), Some(3L)) | ||
| verifyBatchIds(Seq(1L), Some(1L), Some(1L)) |
There was a problem hiding this comment.
you didnt test the valid cases when one of the start or end is None.
tdas
reviewed
Aug 8, 2017
| @@ -1314,6 +1314,7 @@ class FileStreamSourceSuite extends FileStreamSourceTest { | |||
| val metadataLog = | |||
| new FileStreamSourceLog(FileStreamSourceLog.VERSION, spark, dir.getAbsolutePath) | |||
| assert(metadataLog.add(0, Array(FileEntry(s"$scheme:///file1", 100L, 0)))) | |||
| assert(metadataLog.add(1, Array(FileEntry(s"$scheme:///file2", 200L, 0)))) | |||
There was a problem hiding this comment.
newSource.getBatch(None, FileStreamSourceOffset(1)) will fail without this because batch 1 doesn't exist.
|
Test build #80418 has finished for PR 18799 at commit
|
|
@tdas addressed your comments |
|
LGTM. |
|
Test build #80429 has finished for PR 18799 at commit
|
|
Merged to master. But there were conflicts with 2.2. Can you make another PR for 2.2. |
tdas
pushed a commit
to tdas/spark
that referenced
this pull request
Aug 9, 2017
… return value When I was investigating a flaky test, I realized that many places don't check the return value of `HDFSMetadataLog.get(batchId: Long): Option[T]`. When a batch is supposed to be there, the caller just ignores None rather than throwing an error. If some bug causes a query doesn't generate a batch metadata file, this behavior will hide it and allow the query continuing to run and finally delete metadata logs and make it hard to debug. This PR ensures that places calling HDFSMetadataLog.get always check the return value. Jenkins Author: Shixiong Zhu <shixiong@databricks.com> Closes apache#18799 from zsxwing/SPARK-21596.
asfgit
pushed a commit
that referenced
this pull request
Aug 9, 2017
… return value Same PR as #18799 but for branch 2.2. Main discussion the other PR. -------- When I was investigating a flaky test, I realized that many places don't check the return value of `HDFSMetadataLog.get(batchId: Long): Option[T]`. When a batch is supposed to be there, the caller just ignores None rather than throwing an error. If some bug causes a query doesn't generate a batch metadata file, this behavior will hide it and allow the query continuing to run and finally delete metadata logs and make it hard to debug. This PR ensures that places calling HDFSMetadataLog.get always check the return value. Jenkins Author: Shixiong Zhu <shixiong@databricks.com> Closes #18890 from tdas/SPARK-21596-2.2.
MatthewRBruce
pushed a commit
to Shopify/spark
that referenced
this pull request
Jul 31, 2018
… return value Same PR as apache#18799 but for branch 2.2. Main discussion the other PR. -------- When I was investigating a flaky test, I realized that many places don't check the return value of `HDFSMetadataLog.get(batchId: Long): Option[T]`. When a batch is supposed to be there, the caller just ignores None rather than throwing an error. If some bug causes a query doesn't generate a batch metadata file, this behavior will hide it and allow the query continuing to run and finally delete metadata logs and make it hard to debug. This PR ensures that places calling HDFSMetadataLog.get always check the return value. Jenkins Author: Shixiong Zhu <shixiong@databricks.com> Closes apache#18890 from tdas/SPARK-21596-2.2.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
When I was investigating a flaky test, I realized that many places don't check the return value of
HDFSMetadataLog.get(batchId: Long): Option[T]. When a batch is supposed to be there, the caller just ignores None rather than throwing an error. If some bug causes a query doesn't generate a batch metadata file, this behavior will hide it and allow the query continuing to run and finally delete metadata logs and make it hard to debug.This PR ensures that places calling HDFSMetadataLog.get always check the return value.
How was this patch tested?
Jenkins