Github user zsxwing commented on a diff in the pull request:
https://github.com/apache/spark/pull/6457#discussion_r39926238
--- Diff: core/src/main/scala/org/apache/spark/rpc/netty/Inbox.scala ---
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.rpc.netty
+
+import java.util.LinkedList
+import javax.annotation.concurrent.GuardedBy
+
+import scala.util.control.NonFatal
+
+import org.apache.spark.{Logging, SparkException}
+import org.apache.spark.rpc.{RpcAddress, RpcEndpoint,
ThreadSafeRpcEndpoint}
+
+private[netty] sealed trait InboxMessage
+
+private[netty] case class ContentMessage(
+ senderAddress: RpcAddress,
+ content: Any,
+ needReply: Boolean,
+ context: NettyRpcCallContext) extends InboxMessage
+
+private[netty] case object OnStart extends InboxMessage
+
+private[netty] case object OnStop extends InboxMessage
+
+/**
+ * A broadcast message that indicates connecting to a remote node.
+ */
+private[netty] case class Associated(remoteAddress: RpcAddress) extends
InboxMessage
+
+/**
+ * A broadcast message that indicates a remote connection is lost.
+ */
+private[netty] case class Disassociated(remoteAddress: RpcAddress) extends
InboxMessage
+
+/**
+ * A broadcast message that indicates a network error
+ */
+private[netty] case class AssociationError(cause: Throwable,
remoteAddress: RpcAddress)
+ extends InboxMessage
+
+/**
+ * A inbox that stores messages for an [[RpcEndpoint]] and posts messages
to it thread-safely.
+ * @param endpointRef
+ * @param endpoint
+ */
+private[netty] class Inbox(
+ val endpointRef: NettyRpcEndpointRef,
+ val endpoint: RpcEndpoint) extends Logging {
+
+ @GuardedBy("this")
+ protected val messages = new LinkedList[InboxMessage]()
+
+ @GuardedBy("this")
+ private var stopped = false
+
+ @GuardedBy("this")
+ private var enableConcurrent = false
+
+ @GuardedBy("this")
+ private var workerCount = 0
+
+ // OnStart should be the first message to process
+ synchronized {
+ messages.add(OnStart)
+ }
+
+ /**
+ * Process stored messages.
+ */
+ def process(dispatcher: Dispatcher): Unit = {
+ var message: InboxMessage = null
+ synchronized {
+ if (!enableConcurrent && workerCount != 0) {
+ return
+ }
+ message = messages.poll()
+ if (message != null) {
+ workerCount += 1
+ } else {
+ return
+ }
+ }
+ while (true) {
+ safelyCall(endpoint) {
+ message match {
+ case ContentMessage(_sender, content, needReply, context) =>
+ val pf: PartialFunction[Any, Unit] =
+ if (needReply) {
+ endpoint.receiveAndReply(context)
+ } else {
+ endpoint.receive
+ }
+ try {
+ pf.applyOrElse[Any, Unit](content, { msg =>
+ throw new SparkException(s"Unmatched message $message from
${_sender}")
+ })
+ if (!needReply) {
+ context.finish()
+ }
+ } catch {
+ case NonFatal(e) =>
+ if (needReply) {
+ // If the sender asks a reply, we should send the error
back to the sender
+ context.sendFailure(e)
+ } else {
+ context.finish()
+ throw e
+ }
+ }
+
+ case OnStart => {
+ endpoint.onStart()
+ if (!endpoint.isInstanceOf[ThreadSafeRpcEndpoint]) {
+ synchronized {
+ enableConcurrent = true
+ }
+ }
+ }
+
+ case OnStop =>
+ assert(workerCount == 1)
+ dispatcher.removeRpcEndpointRef(endpoint)
+ endpoint.onStop()
--- End diff --
Since it's `onStop` and all further messages will be dropped, I prefer to
let `self` return `null` so that the user can not use `self.send/ask`.
---
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
