Skip to content
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

Jump to bottom

[SPARK-23345][SQL] Remove open stream record even closing it fails #20524

Closed
wants to merge 2 commits into from
Closed

[SPARK-23345][SQL] Remove open stream record even closing it fails #20524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34df0cd
Remove open stream record even closing fails.
viirya Feb 7, 2018
37024fd
Increase interval.
viirya Feb 7, 2018
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
7 changes: 5 additions & 2 deletions core/src/test/scala/org/apache/spark/DebugFilesystem.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ class DebugFilesystem extends LocalFileSystem {
override def markSupported(): Boolean = wrapped.markSupported()

override def close(): Unit = {
wrapped.close()
removeOpenStream(wrapped)
try {
wrapped.close()
} finally {
removeOpenStream(wrapped)
}
}

override def read(): Int = wrapped.read()
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/test/SharedSparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ trait SharedSparkSession
spark.sharedState.cacheManager.clearCache()
// files can be closed from other threads, so wait a bit
// normally this doesn't take more than 1s
eventually(timeout(10.seconds)) {
eventually(timeout(10.seconds), interval(2.seconds)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

what's the problem if interval is small?

Copy link
Member Author

Choose a reason for hiding this comment

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

assertNoOpenStreams and removeOpenStream are both synchronized on openStreams map. I want to increase interval to prevent starvation for removeOpenStream.

Copy link
Member

Choose a reason for hiding this comment

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

The default is 15 milliseconds. It should be fine.

But, I am also fine to change this to 2 seconds. I checked the test history and this does not increase the testing time.

DebugFilesystem.assertNoOpenStreams()
}
}
Expand Down