Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/10464#discussion_r48678511
--- Diff:
streaming/src/main/scala/org/apache/spark/streaming/dstream/SocketInputDStream.scala
---
@@ -51,29 +51,44 @@ 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")
+ } catch {
+ case NonFatal(e) =>
+ restart(s"Error connecting to $host:$port", e)
+ }
+
+ if (socket != null && socket.isConnected) {
+ // Start the thread that receives data over a connection
+ new Thread("Socket Receiver") {
+ setDaemon(true)
+ override def run() { receive() }
+ }.start()
+ }
}
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
+ synchronized {
+ if (socket != null) {
+ socket.close()
+ socket = null
+ logInfo(s"Closed socket to $host:$port")
+ }
+ }
}
/** Create a socket connection and receive data until receiver is
stopped */
def receive() {
- var socket: Socket = null
try {
- logInfo("Connecting to " + host + ":" + port)
- socket = new Socket(host, port)
- logInfo("Connected to " + host + ":" + port)
- val iterator = bytesToObjects(socket.getInputStream())
+ val iterator = bytesToObjects(socket.getInputStream)
--- End diff --
Nit: the empty parens were correct here; it has a side effect
---
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
