Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/10464#discussion_r48544697
--- Diff:
streaming/src/main/scala/org/apache/spark/streaming/dstream/SocketInputDStream.scala
---
@@ -52,46 +52,60 @@ class SocketReceiver[T: ClassTag](
storageLevel: StorageLevel
) extends Receiver[T](storageLevel) with Logging {
+ private var socket: Socket = _
+
def onStart() {
- // Start the thread that receives data over a connection
- new Thread("Socket Receiver") {
- setDaemon(true)
- override def run() { receive() }
- }.start()
+
+ try {
+ logInfo(s"Connecting to $host:$port")
+ socket = new Socket(host, port)
+ logInfo(s"Connected to $host:$port")
+
+ // Start the thread that receives data over a connection
+ new Thread("Socket Receiver") {
+ setDaemon(true)
+ override def run() { receive() }
+ }.start()
+ } catch {
+ case e: ConnectException =>
+ restart(s"Error connecting to $host:$port", e)
+ case NonFatal(e) =>
+ logWarning("Error receiving data", e)
+ restart("Error receiving data", e)
+ } finally {
+ onStop()
+ }
}
def onStop() {
- // There is nothing much to do as the thread calling receive()
- // is designed to stop by itself isStopped() returns false
+ //in case restart thread close it twice
+ if (socket != null) {
+ socket.close()
--- End diff --
This is now incorrect, since you can have two threads enter this block and
both close the socket, or else close and null it before the other does. The
synchronization of close() is irrelevant.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
