Skip to content

[SPARK-12048][SQL] Part 2 Prevent to close JDBC resources twice #10320

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
wants to merge 1 commit into from
Closed

[SPARK-12048][SQL] Part 2 Prevent to close JDBC resources twice #10320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class JdbcRDD[T: ClassTag](

override def compute(thePart: Partition, context: TaskContext): Iterator[T] = new NextIterator[T]
{
var closed = false
context.addTaskCompletionListener{ context => closeIfNeeded() }
val part = thePart.asInstanceOf[JdbcPartition]
val conn = getConnection()
Expand Down Expand Up @@ -100,6 +101,7 @@ class JdbcRDD[T: ClassTag](
}

override def close() {
if (closed) return
try {
if (null != rs) {
rs.close()
Copy link
Contributor

@jerryshao jerryshao Dec 16, 2015

Choose a reason for hiding this comment

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

From my understanding, we could call rs = null after it is closed, also for stmt and conn in the same way to make this function is reenterable.

Copy link
Member

@srowen srowen Dec 16, 2015

Choose a reason for hiding this comment

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

That's another approach, though the other implementation opted for a close flag

Expand All @@ -122,6 +124,7 @@ class JdbcRDD[T: ClassTag](
} catch {
case e: Exception => logWarning("Exception closing connection", e)
}
closed = true
}
}
}
Expand Down