Skip to content

[core] [minor] Make sure ConnectionManager stops. #5566

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

[core] [minor] Make sure ConnectionManager stops. #5566

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
16 changes: 10 additions & 6 deletions core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ private[nio] class ConnectionManager(
private val writeRunnableStarted: HashSet[SelectionKey] = new HashSet[SelectionKey]()
private val readRunnableStarted: HashSet[SelectionKey] = new HashSet[SelectionKey]()

@volatile private var isActive = true
private val selectorThread = new Thread("connection-manager-thread") {
override def run(): Unit = ConnectionManager.this.run()
}
Expand Down Expand Up @@ -342,7 +343,7 @@ private[nio] class ConnectionManager(

def run() {
try {
while(!selectorThread.isInterrupted) {
while (isActive) {
while (!registerRequests.isEmpty) {
val conn: SendingConnection = registerRequests.dequeue()
addListeners(conn)
Expand Down Expand Up @@ -398,7 +399,7 @@ private[nio] class ConnectionManager(
} catch {
// Explicitly only dealing with CancelledKeyException here since other exceptions
// should be dealt with differently.
case e: CancelledKeyException => {
case e: CancelledKeyException =>
// Some keys within the selectors list are invalid/closed. clear them.
val allKeys = selector.keys().iterator()

Expand All @@ -420,8 +421,11 @@ private[nio] class ConnectionManager(
}
}
}
}
0
0

case e: ClosedSelectorException =>
logDebug("Failed select() as selector is closed.", e)
return
}

if (selectedKeysCount == 0) {
Expand Down Expand Up @@ -988,11 +992,11 @@ private[nio] class ConnectionManager(
}

def stop() {
isActive = false
ackTimeoutMonitor.stop()
selector.wakeup()
selector.close()
selectorThread.interrupt()
selectorThread.join()
selector.close()
val connections = connectionsByKey.values
connections.foreach(_.close())
if (connectionsByKey.size != 0) {
Expand Down