X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRpcBroker.java;h=0c5315c3dc8f9d449dbec4d332ec56a05283ee6e;hp=4ec96c29cd2510175defa6327a235ffecb519b28;hb=168591eb3dfc298b631e8dc51e25b0331c105cfc;hpb=63b36aa3537d77bd9be323e1113716ef2cd54098 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java index 4ec96c29cd..0c5315c3dc 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java @@ -11,108 +11,111 @@ package org.opendaylight.controller.remote.rpc; import akka.actor.ActorRef; import akka.actor.Props; import akka.japi.Creator; -import akka.japi.Pair; -import org.opendaylight.controller.remote.rpc.messages.ErrorResponse; +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import java.util.Arrays; +import java.util.Collection; +import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; +import org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeSerializer; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcException; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node; import org.opendaylight.controller.remote.rpc.messages.ExecuteRpc; -import org.opendaylight.controller.remote.rpc.messages.InvokeRpc; import org.opendaylight.controller.remote.rpc.messages.RpcResponse; -import org.opendaylight.controller.remote.rpc.utils.LatestEntryRoutingLogic; -import org.opendaylight.controller.remote.rpc.registry.RpcRegistry; -import org.opendaylight.controller.remote.rpc.utils.ActorUtil; -import org.opendaylight.controller.remote.rpc.utils.RoutingLogic; -import org.opendaylight.controller.xml.codec.XmlUtils; -import org.opendaylight.controller.sal.connector.api.RpcRouter; -import org.opendaylight.controller.sal.core.api.Broker; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.common.RpcError; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; +import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.concurrent.Future; - /** * Actor to initiate execution of remote RPC on other nodes of the cluster. */ public class RpcBroker extends AbstractUntypedActor { - private static final Logger LOG = LoggerFactory.getLogger(RpcBroker.class); - private final Broker.ProviderSession brokerSession; - private final ActorRef rpcRegistry; - private SchemaContext schemaContext; - - private RpcBroker(Broker.ProviderSession brokerSession, ActorRef rpcRegistry, SchemaContext schemaContext){ - this.brokerSession = brokerSession; - this.rpcRegistry = rpcRegistry; - this.schemaContext = schemaContext; - } - - public static Props props(final Broker.ProviderSession brokerSession, final ActorRef rpcRegistry, final SchemaContext schemaContext){ - return Props.create(new Creator(){ - - @Override - public RpcBroker create() throws Exception { - return new RpcBroker(brokerSession, rpcRegistry, schemaContext); - } - }); - } - @Override - protected void handleReceive(Object message) throws Exception { - if(message instanceof InvokeRpc) { - invokeRemoteRpc((InvokeRpc) message); - } else if(message instanceof ExecuteRpc) { - executeRpc((ExecuteRpc) message); - } - } - - private void invokeRemoteRpc(InvokeRpc msg) { - // Look up the remote actor to execute rpc - LOG.debug("Looking up the remote actor for route {}", msg); - try { - // Find router - RpcRouter.RouteIdentifier routeId = new RouteIdentifierImpl(null, msg.getRpc(), msg.getIdentifier()); - RpcRegistry.Messages.FindRouters rpcMsg = new RpcRegistry.Messages.FindRouters(routeId); - RpcRegistry.Messages.FindRoutersReply rpcReply = - (RpcRegistry.Messages.FindRoutersReply) ActorUtil.executeOperation(rpcRegistry, rpcMsg, ActorUtil.LOCAL_ASK_DURATION, ActorUtil.LOCAL_AWAIT_DURATION); - - List> actorRefList = rpcReply.getRouterWithUpdateTime(); - - if(actorRefList == null || actorRefList.isEmpty()) { - LOG.debug("No remote actor found for rpc {{}}.", msg.getRpc()); - - getSender().tell(new ErrorResponse( - new IllegalStateException("No remote actor found for rpc execution of : " + msg.getRpc())), self()); - } else { - RoutingLogic logic = new LatestEntryRoutingLogic(actorRefList); - - ExecuteRpc executeMsg = new ExecuteRpc(XmlUtils.inputCompositeNodeToXml(msg.getInput(), schemaContext), msg.getRpc()); - Object operationRes = ActorUtil.executeOperation(logic.select(), - executeMsg, ActorUtil.REMOTE_ASK_DURATION, ActorUtil.REMOTE_AWAIT_DURATION); - - getSender().tell(operationRes, self()); - } - } catch (Exception e) { - LOG.error("invokeRemoteRpc: {}", e); - getSender().tell(new ErrorResponse(e), self()); + private static final Logger LOG = LoggerFactory.getLogger(RpcBroker.class); + private final DOMRpcService rpcService; + + private RpcBroker(final DOMRpcService rpcService) { + this.rpcService = rpcService; } - } + public static Props props(final DOMRpcService rpcService) { + Preconditions.checkNotNull(rpcService, "DOMRpcService can not be null"); + return Props.create(new RpcBrokerCreator(rpcService)); + } + @Override + protected void handleReceive(final Object message) throws Exception { + if (message instanceof ExecuteRpc) { + executeRpc((ExecuteRpc) message); + } + } - private void executeRpc(ExecuteRpc msg) { - LOG.debug("Executing rpc for rpc {}", msg.getRpc()); - try { - Future> rpc = brokerSession.rpc(msg.getRpc(), - XmlUtils.inputXmlToCompositeNode(msg.getRpc(), msg.getInputCompositeNode(), schemaContext)); - RpcResult rpcResult = rpc != null ? rpc.get():null; - CompositeNode result = rpcResult != null ? rpcResult.getResult() : null; - getSender().tell(new RpcResponse(XmlUtils.outputCompositeNodeToXml(result, schemaContext)), self()); - } catch (Exception e) { - LOG.error("executeRpc: {}", e); - getSender().tell(new ErrorResponse(e), self()); + private void executeRpc(final ExecuteRpc msg) { + LOG.debug("Executing rpc {}", msg.getRpc()); + final NormalizedNode input = RemoteRpcInput.from(msg.getInputNormalizedNode()); + final SchemaPath schemaPath = SchemaPath.create(true, msg.getRpc()); + final ActorRef sender = getSender(); + final ActorRef self = self(); + + try { + final CheckedFuture future = rpcService.invokeRpc(schemaPath, input); + + Futures.addCallback(future, new FutureCallback() { + @Override + public void onSuccess(final DOMRpcResult result) { + if (result.getErrors() != null && (!result.getErrors().isEmpty())) { + final String message = String.format("Execution of RPC %s failed", msg.getRpc()); + Collection errors = result.getErrors(); + if (errors == null || errors.size() == 0) { + errors = Arrays.asList(RpcResultBuilder.newError(ErrorType.RPC, null, message)); + } + + sender.tell(new akka.actor.Status.Failure(new RpcErrorsException(message, errors)), self); + } else { + final Node serializedResultNode; + if (result.getResult() == null) { + serializedResultNode = null; + } else { + serializedResultNode = NormalizedNodeSerializer.serialize(result.getResult()); + } + + LOG.debug("Sending response for execute rpc : {}", msg.getRpc()); + + sender.tell(new RpcResponse(serializedResultNode), self); + } + } + + @Override + public void onFailure(final Throwable t) { + LOG.error("executeRpc for {} failed: {}", msg.getRpc(), t); + sender.tell(new akka.actor.Status.Failure(t), self); + } + }); + } catch (final Exception e) { + sender.tell(new akka.actor.Status.Failure(e), sender); + } } - } + private static class RpcBrokerCreator implements Creator { + private static final long serialVersionUID = 1L; + + final DOMRpcService rpcService; + + RpcBrokerCreator(final DOMRpcService rpcService) { + this.rpcService = rpcService; + } + + @Override + public RpcBroker create() throws Exception { + return new RpcBroker(rpcService); + } + } }