Skip to content

Cleanup on Connection and ConnectionManager #1060

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

Cleanup on Connection and ConnectionManager #1060

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/network/Connection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class SendingConnection(val address: InetSocketAddress, selector_ : Selector,
var nextMessageToBeUsed = 0

def addMessage(message: Message) {
messages.synchronized{
messages.synchronized {
/* messages += message */
messages.enqueue(message)
logDebug("Added [" + message + "] to outbox for sending to " +
Expand All @@ -223,7 +223,7 @@ class SendingConnection(val address: InetSocketAddress, selector_ : Selector,
while (!messages.isEmpty) {
/* nextMessageToBeUsed = nextMessageToBeUsed % messages.size */
/* val message = messages(nextMessageToBeUsed) */
val message = messages.dequeue
val message = messages.dequeue()
val chunk = message.getChunkForSending(defaultChunkSize)
if (chunk.isDefined) {
messages.enqueue(message)
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf,
try {
while(!selectorThread.isInterrupted) {
while (! registerRequests.isEmpty) {
val conn: SendingConnection = registerRequests.dequeue
val conn: SendingConnection = registerRequests.dequeue()
addListeners(conn)
conn.connect()
addConnection(conn)
}

while(!keyInterestChangeRequests.isEmpty) {
val (key, ops) = keyInterestChangeRequests.dequeue
val (key, ops) = keyInterestChangeRequests.dequeue()

try {
if (key.isValid) {
Expand Down Expand Up @@ -532,9 +532,9 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf,
}
return
}
var securityMsgResp = SecurityMessage.fromResponse(replyToken,
val securityMsgResp = SecurityMessage.fromResponse(replyToken,
securityMsg.getConnectionId.toString())
var message = securityMsgResp.toBufferMessage
val message = securityMsgResp.toBufferMessage
if (message == null) throw new Exception("Error creating security message")
sendSecurityMessage(waitingConn.getRemoteConnectionManagerId(), message)
} catch {
Expand Down Expand Up @@ -568,9 +568,9 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf,
logDebug("Server sasl not completed: " + connection.connectionId)
}
if (replyToken != null) {
var securityMsgResp = SecurityMessage.fromResponse(replyToken,
val securityMsgResp = SecurityMessage.fromResponse(replyToken,
securityMsg.getConnectionId)
var message = securityMsgResp.toBufferMessage
val message = securityMsgResp.toBufferMessage
if (message == null) throw new Exception("Error creating security Message")
sendSecurityMessage(connection.getRemoteConnectionManagerId(), message)
}
Expand Down Expand Up @@ -618,7 +618,7 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf,
return true
}
}
return false
false
}

private def handleMessage(
Expand Down Expand Up @@ -694,9 +694,9 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf,
var firstResponse: Array[Byte] = null
try {
firstResponse = conn.sparkSaslClient.firstToken()
var securityMsg = SecurityMessage.fromResponse(firstResponse,
val securityMsg = SecurityMessage.fromResponse(firstResponse,
conn.connectionId.toString())
var message = securityMsg.toBufferMessage
val message = securityMsg.toBufferMessage
if (message == null) throw new Exception("Error creating security message")
connectionsAwaitingSasl += ((conn.connectionId, conn))
sendSecurityMessage(connManagerId, message)
Expand Down