import static java.util.Objects.requireNonNull;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
+import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import javax.annotation.concurrent.GuardedBy;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.bgpcep.pcep.topology.provider.session.stats.SessionStateImpl;
import org.opendaylight.bgpcep.pcep.topology.provider.session.stats.TopologySessionStats;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.protocol.pcep.PCEPCloseTermination;
import org.opendaylight.protocol.pcep.PCEPSession;
import org.opendaylight.protocol.pcep.PCEPTerminationReason;
import org.opendaylight.protocol.pcep.TerminationReason;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev171025.LspObject;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev171025.Path1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev171025.lsp.object.Lsp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.MessageHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ProtocolVersion;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.LspId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.Node1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.Node1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.OperationResult;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.PccSyncState;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.TearDownSessionInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.lsp.metadata.Metadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.PathComputationClient;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.PathComputationClientBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.path.computation.client.ReportedLsp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.path.computation.client.ReportedLspBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.path.computation.client.ReportedLspKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.pcep.client.attributes.path.computation.client.reported.lsp.Path;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.LspObject;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.Path1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.lsp.object.Lsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.MessageHeader;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Object;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ProtocolVersion;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.LspId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.Node1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.Node1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.OperationResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.PccSyncState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.TearDownSessionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.lsp.metadata.Metadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.PathComputationClient;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.PathComputationClientBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.ReportedLsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.ReportedLspBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.ReportedLspKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.reported.lsp.Path;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.reported.lsp.PathKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* @param <L> identifier type for LSPs
*/
public abstract class AbstractTopologySessionListener<S, L> implements TopologySessionListener, TopologySessionStats {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractTopologySessionListener.class);
+
+ static final String MISSING_XML_TAG = "Mandatory XML tags are missing.";
static final MessageHeader MESSAGE_HEADER = new MessageHeader() {
- private final ProtocolVersion version = new ProtocolVersion((short) 1);
+ private final ProtocolVersion version = new ProtocolVersion(Uint8.ONE);
@Override
- public Class<? extends DataContainer> getImplementedInterface() {
+ public Class<MessageHeader> implementedInterface() {
return MessageHeader.class;
}
@Override
public ProtocolVersion getVersion() {
- return this.version;
+ return version;
}
};
- static final String MISSING_XML_TAG = "Mandatory XML tags are missing.";
- private static final Logger LOG = LoggerFactory.getLogger(AbstractTopologySessionListener.class);
+
@GuardedBy("this")
final Map<L, String> lsps = new HashMap<>();
@GuardedBy("this")
- final SessionStateImpl listenerState;
+ SessionStateImpl listenerState;
+
@GuardedBy("this")
private final Map<S, PCEPRequest> requests = new HashMap<>();
@GuardedBy("this")
- private final Map<String, ReportedLsp> lspData = new HashMap<>();
+ private final Map<String, ReportedLsp> lspData = new ConcurrentHashMap<>();
private final ServerSessionManager serverSessionManager;
private InstanceIdentifier<PathComputationClient> pccIdentifier;
+ @GuardedBy("this")
private TopologyNodeState nodeState;
+ private final AtomicBoolean synced = new AtomicBoolean(false);
@GuardedBy("this")
- private boolean synced = false;
private PCEPSession session;
+ @GuardedBy("this")
private SyncOptimization syncOptimization;
+ @GuardedBy("this")
private boolean triggeredResyncInProcess;
AbstractTopologySessionListener(final ServerSessionManager serverSessionManager) {
this.serverSessionManager = requireNonNull(serverSessionManager);
- this.listenerState = new SessionStateImpl(this);
}
@Override
- public final synchronized void onSessionUp(final PCEPSession session) {
- /*
- * The session went up. Look up the router in Inventory model,
- * create it if it is not there (marking that fact for later
- * deletion), and mark it as synchronizing. Also create it in
- * the topology model, with empty LSP list.
- */
- final InetAddress peerAddress = session.getRemoteAddress();
-
- this.syncOptimization = new SyncOptimization(session);
-
- final TopologyNodeState state = this.serverSessionManager.takeNodeState(peerAddress,
- this, isLspDbRetreived());
-
- // takeNodeState(..) may fail when the server session manager is being restarted due to configuration change
- if (state == null) {
- LOG.error("Unable to fetch topology node state for PCEP session. Closing session {}", session);
- session.close(TerminationReason.UNKNOWN);
- this.onSessionTerminated(session, new PCEPCloseTermination(TerminationReason.UNKNOWN));
- return;
- }
+ public final void onSessionUp(final PCEPSession psession) {
+ synchronized (this.serverSessionManager) {
+ synchronized (this) {
+ /*
+ * The session went up. Look up the router in Inventory model, create it if it
+ * is not there (marking that fact for later deletion), and mark it as
+ * synchronizing. Also create it in the topology model, with empty LSP list.
+ */
+ final InetAddress peerAddress = psession.getRemoteAddress();
+
+ this.syncOptimization = new SyncOptimization(psession);
+ final boolean haveLspDbVersion = this.syncOptimization.isDbVersionPresent();
+
+ final TopologyNodeState state =
+ this.serverSessionManager.takeNodeState(peerAddress, this, haveLspDbVersion);
+
+ // takeNodeState(..) may fail when the server session manager is being restarted
+ // due to configuration change
+ if (state == null) {
+ LOG.error("Unable to fetch topology node state for PCEP session. Closing session {}", psession);
+ psession.close(TerminationReason.UNKNOWN);
+ this.onSessionTerminated(psession, new PCEPCloseTermination(TerminationReason.UNKNOWN));
+ return;
+ }
- if (this.session != null || this.nodeState != null) {
- LOG.error("PCEP session is already up with {}. Closing session {}", session.getRemoteAddress(), session);
- session.close(TerminationReason.UNKNOWN);
- this.onSessionTerminated(session, new PCEPCloseTermination(TerminationReason.UNKNOWN));
- return;
- }
- this.session = session;
- this.nodeState = state;
- this.serverSessionManager.bind(this.nodeState.getNodeId(), this.listenerState);
-
- LOG.trace("Peer {} resolved to topology node {}", peerAddress, state.getNodeId());
-
- // Our augmentation in the topology node
- final PathComputationClientBuilder pccBuilder = new PathComputationClientBuilder();
-
- onSessionUp(session, pccBuilder);
- this.synced = isSynchronized();
-
- pccBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(peerAddress.getHostAddress()));
- final InstanceIdentifier<Node1> topologyAugment = state.getNodeId().augmentation(Node1.class);
- this.pccIdentifier = topologyAugment.child(PathComputationClient.class);
- final Node initialNodeState = state.getInitialNodeState();
- final boolean isNodePresent = isLspDbRetreived() && initialNodeState != null;
- if (isNodePresent) {
- loadLspData(initialNodeState, this.lspData, this.lsps, isIncrementalSynchro());
- pccBuilder.setReportedLsp(initialNodeState.getAugmentation(Node1.class)
- .getPathComputationClient().getReportedLsp());
- }
- writeNode(pccBuilder, state, topologyAugment);
- this.listenerState.init(session);
- LOG.info("Session with {} attached to topology node {}", session.getRemoteAddress(), state.getNodeId());
- }
+ if (this.session != null || this.nodeState != null) {
+ LOG.error("PCEP session is already up with {}. Closing session {}", peerAddress, psession);
+ psession.close(TerminationReason.UNKNOWN);
+ this.onSessionTerminated(psession, new PCEPCloseTermination(TerminationReason.UNKNOWN));
+ return;
+ }
+ this.session = psession;
+ this.nodeState = state;
- private void writeNode(final PathComputationClientBuilder pccBuilder, final TopologyNodeState state,
- final InstanceIdentifier<Node1> topologyAugment) {
- final Node1 ta = new Node1Builder().setPathComputationClient(pccBuilder.build()).build();
+ LOG.trace("Peer {} resolved to topology node {}", peerAddress, state.getNodeId());
- final ReadWriteTransaction trans = state.rwTransaction();
- trans.put(LogicalDatastoreType.OPERATIONAL, topologyAugment, ta);
- LOG.trace("Peer data {} set to {}", topologyAugment, ta);
+ // Our augmentation in the topology node
+ final PathComputationClientBuilder pccBuilder = new PathComputationClientBuilder()
+ .setIpAddress(IetfInetUtil.INSTANCE.ipAddressNoZoneFor(peerAddress));
- // All set, commit the modifications
- Futures.addCallback(trans.submit(), new FutureCallback<Void>() {
- @Override
- public void onSuccess(final Void result) {
- LOG.trace("Internal state for session {} updated successfully",
- AbstractTopologySessionListener.this.session);
- }
+ // Let subclass fill the details
+ onSessionUp(pccBuilder, peerAddress, psession.getRemoteTlvs());
- @Override
- public void onFailure(final Throwable t) {
- LOG.error("Failed to update internal state for session {}, terminating it",
- AbstractTopologySessionListener.this.session, t);
- AbstractTopologySessionListener.this.session.close(TerminationReason.UNKNOWN);
+ this.synced.set(isSynchronized());
+
+ final InstanceIdentifier<Node1> topologyAugment = state.getNodeId().augmentation(Node1.class);
+ this.pccIdentifier = topologyAugment.child(PathComputationClient.class);
+
+ if (haveLspDbVersion) {
+ final Node initialNodeState = state.getInitialNodeState();
+ if (initialNodeState != null) {
+ loadLspData(initialNodeState, this.lspData, this.lsps, isIncrementalSynchro());
+ pccBuilder.setReportedLsp(
+ initialNodeState.augmentation(Node1.class).getPathComputationClient().getReportedLsp());
+ }
+ }
+ state.storeNode(topologyAugment,
+ new Node1Builder().setPathComputationClient(pccBuilder.build()).build(), psession);
+
+ this.listenerState = new SessionStateImpl(this, psession);
+ this.serverSessionManager.bind(state.getNodeId(), this.listenerState);
+ LOG.info("Session with {} attached to topology node {}", peerAddress, state.getNodeId());
}
- }, MoreExecutors.directExecutor());
+ }
}
- void updatePccState(final PccSyncState pccSyncState) {
+ protected abstract void onSessionUp(PathComputationClientBuilder pccBuilder, InetAddress peerAddress,
+ @Nullable Tlvs remoteTlvs);
+
+ synchronized void updatePccState(final PccSyncState pccSyncState) {
if (this.nodeState == null) {
LOG.info("Server Session Manager is closed.");
AbstractTopologySessionListener.this.session.close(TerminationReason.UNKNOWN);
return;
}
- final MessageContext ctx = new MessageContext(this.nodeState.beginTransaction());
+ final MessageContext ctx = new MessageContext(this.nodeState.getChain().newWriteOnlyTransaction());
updatePccNode(ctx, new PathComputationClientBuilder().setStateSync(pccSyncState).build());
if (pccSyncState != PccSyncState.Synchronized) {
- this.synced = false;
+ this.synced.set(false);
this.triggeredResyncInProcess = true;
}
// All set, commit the modifications
- Futures.addCallback(ctx.trans.submit(), new FutureCallback<Void>() {
+ ctx.trans.commit().addCallback(new FutureCallback<CommitInfo>() {
@Override
- public void onSuccess(final Void result) {
- LOG.trace("Internal state for session {} updated successfully", AbstractTopologySessionListener.this.session);
+ public void onSuccess(final CommitInfo result) {
+ LOG.trace("Pcc Internal state for session {} updated successfully",
+ AbstractTopologySessionListener.this.session);
}
@Override
- public void onFailure(final Throwable t) {
- LOG.error("Failed to update internal state for session {}", AbstractTopologySessionListener.this.session, t);
+ public void onFailure(final Throwable throwable) {
+ LOG.error("Failed to update Pcc internal state for session {}",
+ AbstractTopologySessionListener.this.session, throwable);
AbstractTopologySessionListener.this.session.close(TerminationReason.UNKNOWN);
}
}, MoreExecutors.directExecutor());
}
- boolean isTriggeredSyncInProcess() {
+ synchronized boolean isTriggeredSyncInProcess() {
return this.triggeredResyncInProcess;
}
/**
* Tear down the given PCEP session. It's OK to call this method even after the session
* is already down. It always clear up the current session status.
- *
- * @param session
*/
- @GuardedBy("this")
- private synchronized void tearDown(final PCEPSession session) {
-
- requireNonNull(session);
- this.serverSessionManager.releaseNodeState(this.nodeState, session, isLspDbPersisted());
- if (this.nodeState != null) {
- this.serverSessionManager.unbind(this.nodeState.getNodeId());
- this.nodeState = null;
- }
-
- try {
- if (this.session != null) {
- this.session.close();
- }
- session.close();
- } catch (final Exception e) {
- LOG.error("Session {} cannot be closed.", session, e);
- }
- this.session = null;
- this.syncOptimization = null;
-
- // Clear all requests we know about
- for (final Entry<S, PCEPRequest> e : this.requests.entrySet()) {
- final PCEPRequest r = e.getValue();
- switch (r.getState()) {
- case DONE:
- // Done is done, nothing to do
- LOG.trace("Request {} was done when session went down.", e.getKey());
- break;
- case UNACKED:
- // Peer has not acked: results in failure
- LOG.info("Request {} was incomplete when session went down, failing the instruction", e.getKey());
- r.done(OperationResults.NOACK);
- break;
- case UNSENT:
- // Peer has not been sent to the peer: results in cancellation
- LOG.debug("Request {} was not sent when session went down, cancelling the instruction", e.getKey());
- r.done(OperationResults.UNSENT);
- break;
- default:
- break;
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ private void tearDown(final PCEPSession psession) {
+ requireNonNull(psession);
+ synchronized (this.serverSessionManager) {
+ synchronized (this) {
+ this.serverSessionManager.releaseNodeState(this.nodeState, psession, isLspDbPersisted());
+ clearNodeState();
+
+ try {
+ if (this.session != null) {
+ this.session.close();
+ }
+ psession.close();
+ } catch (final Exception e) {
+ LOG.error("Session {} cannot be closed.", psession, e);
+ }
+ this.session = null;
+ this.listenerState = null;
+ this.syncOptimization = null;
+
+ // Clear all requests we know about
+ for (final Entry<S, PCEPRequest> e : this.requests.entrySet()) {
+ final PCEPRequest r = e.getValue();
+ switch (r.getState()) {
+ case DONE:
+ // Done is done, nothing to do
+ LOG.trace("Request {} was done when session went down.", e.getKey());
+ break;
+ case UNACKED:
+ // Peer has not acked: results in failure
+ LOG.info("Request {} was incomplete when session went down, failing the instruction",
+ e.getKey());
+ r.done(OperationResults.NOACK);
+ break;
+ case UNSENT:
+ // Peer has not been sent to the peer: results in cancellation
+ LOG.debug("Request {} was not sent when session went down, cancelling the instruction",
+ e.getKey());
+ r.done(OperationResults.UNSENT);
+ break;
+ default:
+ break;
+ }
+ }
+ this.requests.clear();
}
}
- this.requests.clear();
}
@Override
- public final synchronized void onSessionDown(final PCEPSession session, final Exception e) {
- LOG.warn("Session {} went down unexpectedly", session, e);
- tearDown(session);
+ public final void onSessionDown(final PCEPSession psession, final Exception exception) {
+ LOG.warn("Session {} went down unexpectedly", psession, exception);
+ tearDown(psession);
}
@Override
- public final synchronized void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason reason) {
- LOG.info("Session {} terminated by peer with reason {}", session, reason);
- tearDown(session);
+ public final void onSessionTerminated(final PCEPSession psession, final PCEPTerminationReason reason) {
+ LOG.info("Session {} terminated by peer with reason {}", psession, reason);
+ tearDown(psession);
}
@Override
- public final synchronized void onMessage(final PCEPSession session, final Message message) {
+ public final synchronized void onMessage(final PCEPSession psession, final Message message) {
if (this.nodeState == null) {
- LOG.warn("Topology node state is null. Unhandled message {} on session {}", message, session);
- session.close(TerminationReason.UNKNOWN);
+ LOG.warn("Topology node state is null. Unhandled message {} on session {}", message, psession);
+ psession.close(TerminationReason.UNKNOWN);
return;
}
- final MessageContext ctx = new MessageContext(this.nodeState.beginTransaction());
+ final MessageContext ctx = new MessageContext(this.nodeState.getChain().newWriteOnlyTransaction());
if (onMessage(ctx, message)) {
- LOG.warn("Unhandled message {} on session {}", message, session);
+ LOG.warn("Unhandled message {} on session {}", message, psession);
//cancel not supported, submit empty transaction
- ctx.trans.submit();
+ ctx.trans.commit().addCallback(new FutureCallback<CommitInfo>() {
+ @Override
+ public void onSuccess(final CommitInfo result) {
+ LOG.trace("Successful commit");
+ }
+
+ @Override
+ public void onFailure(final Throwable trw) {
+ LOG.error("Failed commit", trw);
+ }
+ }, MoreExecutors.directExecutor());
return;
}
- Futures.addCallback(ctx.trans.submit(), new FutureCallback<Void>() {
+ ctx.trans.commit().addCallback(new FutureCallback<CommitInfo>() {
@Override
- public void onSuccess(final Void result) {
- LOG.trace("Internal state for session {} updated successfully", session);
+ public void onSuccess(final CommitInfo result) {
+ LOG.trace("Internal state for session {} updated successfully", psession);
ctx.notifyRequests();
+
}
@Override
- public void onFailure(final Throwable t) {
- LOG.error("Failed to update internal state for session {}, closing it", session, t);
+ public void onFailure(final Throwable throwable) {
+ LOG.error("Failed to update internal state for session {}, closing it", psession, throwable);
ctx.notifyRequests();
- session.close(TerminationReason.UNKNOWN);
+ psession.close(TerminationReason.UNKNOWN);
}
}, MoreExecutors.directExecutor());
}
+ /**
+ * Perform revision-specific message processing when a message arrives.
+ *
+ * @param ctx Message processing context
+ * @param message Protocol message
+ * @return True if the message type is not handle.
+ */
+ protected abstract boolean onMessage(MessageContext ctx, Message message);
+
@Override
public void close() {
- if (this.session != null) {
- this.session.close(TerminationReason.UNKNOWN);
+ synchronized (this.serverSessionManager) {
+ synchronized (this) {
+ clearNodeState();
+ if (this.session != null) {
+ LOG.info("Closing session {}", session);
+ this.session.close(TerminationReason.UNKNOWN);
+ }
+ }
+ }
+ }
+
+ @Holding({"this.serverSessionManager", "this"})
+ private void clearNodeState() {
+ if (this.nodeState != null) {
+ this.serverSessionManager.unbind(this.nodeState.getNodeId());
+ LOG.debug("Clear Node state: {}", this.nodeState.getNodeId());
+ this.nodeState = null;
}
}
final synchronized PCEPRequest removeRequest(final S id) {
final PCEPRequest ret = this.requests.remove(id);
- if (ret != null) {
+ if (ret != null && this.listenerState != null) {
this.listenerState.processRequestStats(ret.getElapsedMillis());
}
LOG.trace("Removed request {} object {}", id, ret);
final synchronized ListenableFuture<OperationResult> sendMessage(final Message message, final S requestId,
final Metadata metadata) {
- final io.netty.util.concurrent.Future<Void> f = this.session.sendMessage(message);
+ final var sendFuture = this.session.sendMessage(message);
this.listenerState.updateStatefulSentMsg(message);
final PCEPRequest req = new PCEPRequest(metadata);
this.requests.put(requestId, req);
setupTimeoutHandler(requestId, req, rpcTimeout);
}
- f.addListener((FutureListener<Void>) future -> {
+ sendFuture.addListener((FutureListener<Void>) future -> {
if (!future.isSuccess()) {
synchronized (AbstractTopologySessionListener.this) {
AbstractTopologySessionListener.this.requests.remove(requestId);
}
/**
- * Update an LSP in the data store
+ * Update an LSP in the data store.
*
* @param ctx Message context
* @param id Revision-specific LSP identifier
final ReportedLsp previous = this.lspData.get(name);
// if no previous report about the lsp exist, just proceed
if (previous != null) {
- final List<Path> updatedPaths = makeBeforeBreak(rlb, previous, name, remove);
+ final Map<PathKey, Path> updatedPaths = makeBeforeBreak(rlb, previous, name, remove);
// if all paths or the last path were deleted, delete whole tunnel
- if (updatedPaths == null || updatedPaths.isEmpty()) {
+ if (updatedPaths.isEmpty()) {
LOG.debug("All paths were removed, removing LSP with {}.", id);
removeLsp(ctx, id);
return;
}
rlb.setPath(updatedPaths);
}
- rlb.setKey(new ReportedLspKey(name));
+ rlb.withKey(new ReportedLspKey(name));
rlb.setName(name);
// If this is an unsolicited update. We need to make sure we retain the metadata already present
}
final ReportedLsp rl = rlb.build();
- ctx.trans.put(LogicalDatastoreType.OPERATIONAL, this.pccIdentifier.child(ReportedLsp.class, rlb.getKey()), rl);
+ ctx.trans.put(LogicalDatastoreType.OPERATIONAL, this.pccIdentifier.child(ReportedLsp.class, rlb.key()), rl);
LOG.debug("LSP {} updated to MD-SAL", name);
this.lspData.put(name, rl);
}
- private List<Path> makeBeforeBreak(final ReportedLspBuilder rlb, final ReportedLsp previous, final String name, final boolean remove) {
+ private static Map<PathKey, Path> makeBeforeBreak(final ReportedLspBuilder rlb, final ReportedLsp previous,
+ final String name, final boolean remove) {
// just one path should be reported
- Preconditions.checkState(rlb.getPath().size() == 1);
- final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.LspId reportedLspId = rlb.getPath().get(0).getLspId();
+ final Path path = Iterables.getOnlyElement(rlb.getPath().values());
+ final var reportedLspId = path.getLspId();
final List<Path> updatedPaths;
//lspId = 0 and remove = false -> tunnel is down, still exists but no path is signaled
//remove existing tunnel's paths now, as explicit path remove will not come
- if (!remove && reportedLspId.getValue() == 0) {
+ if (!remove && reportedLspId.getValue().toJava() == 0) {
updatedPaths = new ArrayList<>();
LOG.debug("Remove previous paths {} to this lsp name {}", previous.getPath(), name);
} else {
// check previous report for existing paths
- updatedPaths = new ArrayList<>(previous.getPath());
+ final Collection<Path> prev = previous.nonnullPath().values();
+ updatedPaths = new ArrayList<>(prev);
LOG.debug("Found previous paths {} to this lsp name {}", updatedPaths, name);
- for (final Path path : previous.getPath()) {
+ for (final Path prevPath : prev) {
//we found reported path in previous reports
- if (path.getLspId().getValue() == 0 || path.getLspId().equals(reportedLspId)) {
- LOG.debug("Match on lsp-id {}", path.getLspId().getValue());
+ if (prevPath.getLspId().getValue().toJava() == 0 || prevPath.getLspId().equals(reportedLspId)) {
+ LOG.debug("Match on lsp-id {}", prevPath.getLspId().getValue());
// path that was reported previously and does have the same lsp-id, path will be updated
- final boolean r = updatedPaths.remove(path);
+ final boolean r = updatedPaths.remove(prevPath);
LOG.trace("Request removed? {}", r);
}
}
// if the path does not exist in previous report, add it to path list, it's a new ERO
// only one path will be added
//lspId is 0 means confirmation message that shouldn't be added (because we have no means of deleting it later)
- LOG.trace("Adding new path {} to {}", rlb.getPath(), updatedPaths);
- updatedPaths.addAll(rlb.getPath());
+ LOG.trace("Adding new path {} to {}", path, updatedPaths);
+ updatedPaths.add(path);
if (remove) {
- if (reportedLspId.getValue() == 0) {
+ if (reportedLspId.getValue().toJava() == 0) {
// if lsp-id also 0, remove all paths
LOG.debug("Removing all paths.");
updatedPaths.clear();
} else {
// path is marked to be removed
- LOG.debug("Removing path {} from {}", rlb.getPath(), updatedPaths);
- final boolean r = updatedPaths.removeAll(rlb.getPath());
+ LOG.debug("Removing path {} from {}", path, updatedPaths);
+ final boolean r = updatedPaths.remove(path);
LOG.trace("Request removed? {}", r);
}
}
LOG.debug("Setting new paths {} to lsp {}", updatedPaths, name);
- return updatedPaths;
+ return Maps.uniqueIndex(updatedPaths, Path::key);
}
/**
* @param ctx Message context
*/
protected final synchronized void stateSynchronizationAchieved(final MessageContext ctx) {
- if (this.synced) {
- LOG.debug("State synchronization achieved while synchronized, not updating state");
+ if (this.synced.getAndSet(true)) {
+ LOG.debug("State synchronization achieved while synchronizing, not updating state");
return;
}
-
- // Update synchronization flag
- this.synced = true;
if (this.triggeredResyncInProcess) {
this.triggeredResyncInProcess = false;
}
this.lspData.remove(name);
}
- protected abstract void onSessionUp(PCEPSession session, PathComputationClientBuilder pccBuilder);
-
- /**
- * Perform revision-specific message processing when a message arrives.
- *
- * @param ctx Message processing context
- * @param message Protocol message
- * @return True if the message type is not handle.
- */
- protected abstract boolean onMessage(MessageContext ctx, Message message);
-
+ @Holding("this")
final String lookupLspName(final L id) {
- requireNonNull(id, "ID parameter null.");
- return this.lsps.get(id);
+ return this.lsps.get(requireNonNull(id, "ID parameter null."));
}
/**
* @param id InstanceIdentifier of the node
* @return null if the node does not exists, or operational data
*/
- final synchronized <T extends DataObject> ListenableFuture<Optional<T>>
- readOperationalData(final InstanceIdentifier<T> id) {
+ final synchronized <T extends DataObject> FluentFuture<Optional<T>>
+ readOperationalData(final InstanceIdentifier<T> id) {
if (this.nodeState == null) {
return null;
}
return this.nodeState.readOperationalData(id);
}
- protected abstract Object validateReportedLsp(final Optional<ReportedLsp> rep, final LspId input);
+ protected abstract Object validateReportedLsp(Optional<ReportedLsp> rep, LspId input);
- protected abstract void loadLspData(final Node node, final Map<String, ReportedLsp> lspData,
- final Map<L, String> lsps, final boolean incrementalSynchro);
+ protected abstract void loadLspData(Node node, Map<String, ReportedLsp> lspData, Map<L, String> lsps,
+ boolean incrementalSynchro);
final boolean isLspDbPersisted() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.isSyncAvoidanceEnabled();
- }
- return false;
- }
-
- final boolean isLspDbRetreived() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.isDbVersionPresent();
- }
- return false;
+ return this.syncOptimization != null && this.syncOptimization.isSyncAvoidanceEnabled();
}
/**
* Is Incremental synchronization if LSP-DB-VERSION are included,
- * LSP-DB-VERSION TLV values doesnt match, and LSP-SYNC-CAPABILITY is enabled
- *
- * @return
+ * LSP-DB-VERSION TLV values doesnt match, and LSP-SYNC-CAPABILITY is enabled.
*/
- final boolean isIncrementalSynchro() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.isSyncAvoidanceEnabled() && this.syncOptimization.isDeltaSyncEnabled();
- }
- return false;
+ final synchronized boolean isIncrementalSynchro() {
+ return this.syncOptimization != null && this.syncOptimization.isSyncAvoidanceEnabled()
+ && this.syncOptimization.isDeltaSyncEnabled();
}
- final boolean isTriggeredInitialSynchro() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.isTriggeredInitSyncEnabled();
- }
- return false;
+ final synchronized boolean isTriggeredInitialSynchro() {
+ return this.syncOptimization != null && this.syncOptimization.isTriggeredInitSyncEnabled();
}
- final boolean isTriggeredReSyncEnabled() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.isTriggeredReSyncEnabled();
- }
- return false;
+ final synchronized boolean isTriggeredReSyncEnabled() {
+ return this.syncOptimization != null && this.syncOptimization.isTriggeredReSyncEnabled();
}
- protected final boolean isSynchronized() {
- if (this.syncOptimization != null) {
- return this.syncOptimization.doesLspDbMatch();
- }
- return false;
+ protected final synchronized boolean isSynchronized() {
+ return this.syncOptimization != null && this.syncOptimization.doesLspDbMatch();
}
@Override
public int getDelegatedLspsCount() {
return Math.toIntExact(this.lspData.values().stream()
- .map(ReportedLsp::getPath).filter(Objects::nonNull).filter(pathList -> !pathList.isEmpty())
- // pick the first path, as delegate status should be same in each path
- .map(pathList -> pathList.get(0))
- .map(path -> path.getAugmentation(Path1.class)).filter(Objects::nonNull)
- .map(LspObject::getLsp).filter(Objects::nonNull)
- .filter(Lsp::isDelegate)
- .count());
+ .map(ReportedLsp::getPath).filter(pathList -> pathList != null && !pathList.isEmpty())
+ // pick the first path, as delegate status should be same in each path
+ .map(pathList -> pathList.values().iterator().next())
+ .map(path -> path.augmentation(Path1.class)).filter(Objects::nonNull)
+ .map(LspObject::getLsp).filter(Objects::nonNull)
+ .filter(Lsp::getDelegate)
+ .count());
}
@Override
- public synchronized boolean isSessionSynchronized() {
- return this.synced;
+ public boolean isSessionSynchronized() {
+ return this.synced.get();
}
@Override
}
void resolveRequest(final PCEPRequest req) {
- this.requests.add(req);
+ requests.add(req);
}
private void notifyRequests() {
- for (final PCEPRequest r : this.requests) {
+ for (final PCEPRequest r : requests) {
r.done(OperationResults.SUCCESS);
}
}
Code Review / bgpcep.git / blobdiff