added implicit transaction family name for the atomic { .. } blocks + changed implicit sender argument to Option[Actor] (transparent change)
This commit is contained in:
Jonas Bonér
parent
ed233e4318
commit
e3ceab036c
11 changed files with 131 additions and 122 deletions
|
|
@ -4,25 +4,22 @@
|
|||
|
||||
package se.scalablesolutions.akka.remote
|
||||
|
||||
import org.jgroups.{JChannel, View, Address, Message, ExtendedMembershipListener, Receiver, SetStateEvent}
|
||||
import org.jgroups.util.Util
|
||||
import org.jgroups.{JChannel, View, Address, Message, ExtendedMembershipListener, Receiver}
|
||||
|
||||
import se.scalablesolutions.akka.Config.config
|
||||
import se.scalablesolutions.akka.util.Logging
|
||||
import se.scalablesolutions.akka.serialization.Serializer
|
||||
import se.scalablesolutions.akka.config.ScalaConfig._
|
||||
import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor, ActorRegistry}
|
||||
import se.scalablesolutions.akka.remote.Cluster.{Node, RelayedMessage}
|
||||
|
||||
import scala.collection.immutable.{Map, HashMap, HashSet}
|
||||
import scala.collection.immutable.{Map, HashMap}
|
||||
import se.scalablesolutions.akka.serialization.Serializer
|
||||
|
||||
/**
|
||||
* Interface for interacting with the cluster.
|
||||
*
|
||||
* Interface for interacting with the Cluster Membership API.
|
||||
*
|
||||
* @author Viktor Klang
|
||||
*/
|
||||
trait Cluster {
|
||||
|
||||
def name: String
|
||||
|
||||
def registerLocalNode(hostname: String, port: Int): Unit
|
||||
|
|
@ -31,69 +28,72 @@ trait Cluster {
|
|||
|
||||
def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit
|
||||
|
||||
def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T]
|
||||
def lookup[T](pf: PartialFunction[RemoteAddress, T]): Option[T]
|
||||
}
|
||||
|
||||
/**
|
||||
* Baseclass for cluster implementations
|
||||
* Base class for cluster actor implementations.
|
||||
*/
|
||||
abstract class ClusterActor extends Actor with Cluster {
|
||||
val name = config.getString("akka.remote.cluster.name") getOrElse "default"
|
||||
}
|
||||
|
||||
/**
|
||||
* A singleton representing the Cluster
|
||||
* Loads a specified ClusterActor and delegates to that instance
|
||||
* A singleton representing the Cluster.
|
||||
* <p/>
|
||||
* Loads a specified ClusterActor and delegates to that instance.
|
||||
*/
|
||||
object Cluster extends Cluster {
|
||||
case class Node(endpoints: List[RemoteAddress])
|
||||
case class RelayedMessage(actorClassFQN:String, msg: AnyRef)
|
||||
private[remote] sealed trait ClusterMessage
|
||||
private[remote] case class Node(endpoints: List[RemoteAddress]) extends ClusterMessage
|
||||
private[remote] case class RelayedMessage(actorClassFQN: String, msg: AnyRef) extends ClusterMessage
|
||||
|
||||
lazy val impl: Option[ClusterActor] = {
|
||||
private[remote] lazy val clusterActor: Option[ClusterActor] = {
|
||||
config.getString("akka.remote.cluster.actor") map (name => {
|
||||
val actor = Class.forName(name)
|
||||
.newInstance
|
||||
.asInstanceOf[ClusterActor]
|
||||
|
||||
.newInstance
|
||||
.asInstanceOf[ClusterActor]
|
||||
SupervisorFactory(
|
||||
SupervisorConfig(
|
||||
RestartStrategy(OneForOne, 3, 100, List(classOf[Exception])),
|
||||
Supervise(actor, LifeCycle(Permanent)) :: Nil
|
||||
)
|
||||
RestartStrategy(OneForOne, 5, 1000, List(classOf[Exception])),
|
||||
Supervise(actor, LifeCycle(Permanent)) :: Nil)
|
||||
).newInstance.start
|
||||
|
||||
actor
|
||||
})
|
||||
}
|
||||
|
||||
def name = impl.map(_.name).getOrElse("No cluster")
|
||||
private[remote] lazy val serializer: Serializer = {
|
||||
val className = config.getString("akka.remote.cluster.serializer", Serializer.Java.getClass.getName)
|
||||
Class.forName(className).newInstance.asInstanceOf[Serializer]
|
||||
}
|
||||
|
||||
def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T] = impl.flatMap(_.lookup(pf))
|
||||
def name = clusterActor.map(_.name).getOrElse("No cluster")
|
||||
|
||||
def registerLocalNode(hostname: String, port: Int): Unit = impl.map(_.registerLocalNode(hostname, port))
|
||||
def lookup[T](pf: PartialFunction[RemoteAddress, T]): Option[T] = clusterActor.flatMap(_.lookup(pf))
|
||||
|
||||
def deregisterLocalNode(hostname: String, port: Int): Unit = impl.map(_.deregisterLocalNode(hostname, port))
|
||||
def registerLocalNode(hostname: String, port: Int): Unit = clusterActor.map(_.registerLocalNode(hostname, port))
|
||||
|
||||
def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit = impl.map(_.relayMessage(to, msg))
|
||||
def deregisterLocalNode(hostname: String, port: Int): Unit = clusterActor.map(_.deregisterLocalNode(hostname, port))
|
||||
|
||||
def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit = clusterActor.map(_.relayMessage(to, msg))
|
||||
}
|
||||
|
||||
/**
|
||||
* Just a placeholder for the JGroupsClusterActor message types
|
||||
* JGroups Internal Cluster messages.
|
||||
*/
|
||||
object JGroupsClusterActor {
|
||||
//Message types
|
||||
sealed trait ClusterMessage
|
||||
case object PapersPlease extends ClusterMessage
|
||||
case class Papers(addresses: List[RemoteAddress]) extends ClusterMessage
|
||||
case object Block extends ClusterMessage
|
||||
case object Unblock extends ClusterMessage
|
||||
case class Zombie(address: Address) extends ClusterMessage
|
||||
case class RegisterLocalNode(server: RemoteAddress) extends ClusterMessage
|
||||
case class DeregisterLocalNode(server: RemoteAddress) extends ClusterMessage
|
||||
private[remote] object JGroupsClusterActor {
|
||||
sealed trait JGroupsClusterMessage
|
||||
case object PapersPlease extends JGroupsClusterMessage
|
||||
case class Papers(addresses: List[RemoteAddress]) extends JGroupsClusterMessage
|
||||
case object Block extends JGroupsClusterMessage
|
||||
case object Unblock extends JGroupsClusterMessage
|
||||
case class Zombie(address: Address) extends JGroupsClusterMessage
|
||||
case class RegisterLocalNode(server: RemoteAddress) extends JGroupsClusterMessage
|
||||
case class DeregisterLocalNode(server: RemoteAddress) extends JGroupsClusterMessage
|
||||
}
|
||||
|
||||
/**
|
||||
* Clustering support via JGroups
|
||||
* Clustering support via JGroups.
|
||||
*/
|
||||
class JGroupsClusterActor extends ClusterActor {
|
||||
import JGroupsClusterActor._
|
||||
|
|
@ -104,10 +104,11 @@ class JGroupsClusterActor extends ClusterActor {
|
|||
@volatile private var remotes: Map[Address, Node] = Map()
|
||||
|
||||
override def init = {
|
||||
log debug "Initiating cluster actor"
|
||||
log debug "Initiating JGroups-based cluster actor"
|
||||
remotes = new HashMap[Address, Node]
|
||||
val me = this
|
||||
//Set up the JGroups local endpoint
|
||||
|
||||
// Set up the JGroups local endpoint
|
||||
channel = Some(new JChannel {
|
||||
setReceiver(new Receiver with ExtendedMembershipListener {
|
||||
def getState: Array[Byte] = null
|
||||
|
|
@ -128,26 +129,26 @@ class JGroupsClusterActor extends ClusterActor {
|
|||
channel.map(_.connect(name))
|
||||
}
|
||||
|
||||
protected def serializer = Serializer.Java //FIXME make this configurable
|
||||
def lookup[T](handleRemoteAddress: PartialFunction[RemoteAddress, T]): Option[T] =
|
||||
remotes.values.toList.flatMap(_.endpoints).find(handleRemoteAddress isDefinedAt _).map(handleRemoteAddress)
|
||||
|
||||
def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T] = remotes.values.toList.flatMap(_.endpoints).find(pf isDefinedAt _).map(pf)
|
||||
def registerLocalNode(hostname: String, port: Int): Unit =
|
||||
send(RegisterLocalNode(RemoteAddress(hostname, port)))
|
||||
|
||||
def registerLocalNode(hostname: String, port: Int): Unit = this send RegisterLocalNode(RemoteAddress(hostname, port))
|
||||
def deregisterLocalNode(hostname: String, port: Int): Unit =
|
||||
send(DeregisterLocalNode(RemoteAddress(hostname, port)))
|
||||
|
||||
def deregisterLocalNode(hostname: String, port: Int): Unit = this send DeregisterLocalNode(RemoteAddress(hostname, port))
|
||||
|
||||
def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit = this send RelayedMessage(to.getName, msg)
|
||||
def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit =
|
||||
send(RelayedMessage(to.getName, msg))
|
||||
|
||||
private def broadcast[T <: AnyRef](recipients: Iterable[Address], msg: T): Unit = {
|
||||
lazy val m = serializer out msg
|
||||
lazy val m = Cluster.serializer out msg
|
||||
for (c <- channel; r <- recipients) c.send(new Message(r, null, m))
|
||||
|
||||
}
|
||||
|
||||
private def broadcast[T <: AnyRef](msg: T): Unit = {
|
||||
if(!remotes.isEmpty) //Don't broadcast if we are not connected anywhere...
|
||||
channel.map(_.send(new Message(null, null, serializer out msg)))
|
||||
}
|
||||
private def broadcast[T <: AnyRef](msg: T): Unit =
|
||||
//Don't broadcast if we are not connected anywhere...
|
||||
if (!remotes.isEmpty) channel.map(_.send(new Message(null, null, Cluster.serializer out msg)))
|
||||
|
||||
def receive = {
|
||||
case Zombie(x) => { //Ask the presumed zombie for papers and prematurely treat it as dead
|
||||
|
|
@ -157,40 +158,40 @@ class JGroupsClusterActor extends ClusterActor {
|
|||
}
|
||||
|
||||
case v: View => {
|
||||
//Not present in the cluster anymore = presumably zombies
|
||||
//Nodes we have no prior knowledge existed = unknowns
|
||||
val members = Set[Address]() ++ v.getMembers.asScala - channel.get.getAddress //Exclude ourselves
|
||||
// Not present in the cluster anymore = presumably zombies
|
||||
// Nodes we have no prior knowledge existed = unknowns
|
||||
val members = Set[Address]() ++ v.getMembers.asScala - channel.get.getAddress // Exclude ourselves
|
||||
val zombies = Set[Address]() ++ remotes.keySet -- members
|
||||
val unknown = members -- remotes.keySet
|
||||
|
||||
log debug v.printDetails
|
||||
|
||||
//Tell the zombies and unknowns to provide papers and prematurely treat the zombies as dead
|
||||
// Tell the zombies and unknowns to provide papers and prematurely treat the zombies as dead
|
||||
broadcast(zombies ++ unknown, PapersPlease)
|
||||
remotes = remotes -- zombies
|
||||
}
|
||||
|
||||
case m: Message => {
|
||||
if (m.getSrc != channel.map(_.getAddress).getOrElse(m.getSrc)) //handle non-own messages only, and only if we're connected
|
||||
(serializer in (m.getRawBuffer, None)) match {
|
||||
|
||||
if (m.getSrc != channel.map(_.getAddress).getOrElse(m.getSrc)) // Handle non-own messages only, and only if we're connected
|
||||
(Cluster.serializer in (m.getRawBuffer, None)) match {
|
||||
|
||||
case PapersPlease => {
|
||||
log debug ("Asked for papers by %s", m.getSrc)
|
||||
broadcast(m.getSrc :: Nil, Papers(local.endpoints))
|
||||
|
||||
if(remotes.get(m.getSrc).isEmpty) //If we were asked for papers from someone we don't know, ask them!
|
||||
|
||||
if (remotes.get(m.getSrc).isEmpty) // If we were asked for papers from someone we don't know, ask them!
|
||||
broadcast(m.getSrc :: Nil, PapersPlease)
|
||||
}
|
||||
|
||||
case Papers(x) => remotes = remotes + (m.getSrc -> Node(x))
|
||||
case Papers(x) => remotes = remotes + (m.getSrc -> Node(x))
|
||||
|
||||
case RelayedMessage(c, m) => ActorRegistry.actorsFor(c).map(_ send m)
|
||||
|
||||
case unknown => log debug ("Unknown message: %s", unknown.toString)
|
||||
|
||||
case unknown => log debug ("Unknown message: %s", unknown.toString)
|
||||
}
|
||||
}
|
||||
|
||||
case rm @ RelayedMessage(_,_) => {
|
||||
case rm @ RelayedMessage(_, _) => {
|
||||
log debug ("Relaying message: %s", rm)
|
||||
broadcast(rm)
|
||||
}
|
||||
|
|
@ -207,8 +208,8 @@ class JGroupsClusterActor extends ClusterActor {
|
|||
broadcast(Papers(local.endpoints))
|
||||
}
|
||||
|
||||
case Block => log debug "UNSUPPORTED: block" //TODO HotSwap to a buffering body
|
||||
case Unblock => log debug "UNSUPPORTED: unblock" //TODO HotSwap back and flush the buffer
|
||||
case Block => log debug "UNSUPPORTED: JGroupsClusterActor::block" //TODO HotSwap to a buffering body
|
||||
case Unblock => log debug "UNSUPPORTED: JGroupsClusterActor::unblock" //TODO HotSwap back and flush the buffer
|
||||
}
|
||||
|
||||
override def shutdown = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue