*/
package org.opendaylight.bgpcep.pcep.topology.provider;
+import static com.google.common.base.Verify.verifyNotNull;
import static java.util.Objects.requireNonNull;
import com.google.common.collect.Iterables;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.pcep.client.attributes.path.computation.client.reported.lsp.Path;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.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.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
@GuardedBy("this")
final Map<PlspId, String> lsps = new HashMap<>();
@GuardedBy("this")
- SessionStateImpl listenerState;
+ private ObjectRegistration<SessionStateImpl> listenerState;
// FIXME: clarify lifecycle rules of this map, most notably the interaction of multiple SrpIdNumbers
@GuardedBy("this")
private final Map<SrpIdNumber, PCEPRequest> requests = new HashMap<>();
@GuardedBy("this")
private final Map<String, ReportedLsp> lspData = new ConcurrentHashMap<>();
- private final TopologySessionStatsRegistry statsProvider;
private final ServerSessionManager serverSessionManager;
+ private final SessionStateRegistry stateRegistry;
private InstanceIdentifier<PathComputationClient> pccIdentifier;
@GuardedBy("this")
@GuardedBy("this")
private boolean triggeredResyncInProcess;
- AbstractTopologySessionListener(final TopologySessionStatsRegistry statsProvider,
+ AbstractTopologySessionListener(final SessionStateRegistry stateRegistry,
final ServerSessionManager serverSessionManager) {
- this.statsProvider = requireNonNull(statsProvider);
+ this.stateRegistry = requireNonNull(stateRegistry);
this.serverSessionManager = requireNonNull(serverSessionManager);
}
*/
final InetAddress peerAddress = psession.getRemoteAddress();
- syncOptimization = new SyncOptimization(psession);
- final boolean haveLspDbVersion = syncOptimization.isDbVersionPresent();
+ syncOptimization = SyncOptimization.of(psession.getLocalTlvs(), psession.getRemoteTlvs());
+ final boolean haveLspDbVersion = syncOptimization.dbVersionPresent();
final TopologyNodeState state =
serverSessionManager.takeNodeState(peerAddress, this, haveLspDbVersion);
session = psession;
nodeState = state;
- LOG.trace("Peer {} resolved to topology node {}", peerAddress, state.getNodeId());
+ final var nodeId = state.getNodeId();
+ LOG.trace("Peer {} resolved to topology node {}", peerAddress, nodeId);
// Our augmentation in the topology node
final PathComputationClientBuilder pccBuilder = new PathComputationClientBuilder()
synced.set(isSynchronized());
- final InstanceIdentifier<Node1> topologyAugment = state.getNodeId().augmentation(Node1.class);
+ final InstanceIdentifier<Node1> topologyAugment = nodeId.augmentation(Node1.class);
pccIdentifier = topologyAugment.child(PathComputationClient.class);
if (haveLspDbVersion) {
state.storeNode(topologyAugment,
new Node1Builder().setPathComputationClient(pccBuilder.build()).build(), psession);
- // TODO: collapse assignment? needs to be verified through bytecode
- final var sessionState = new SessionStateImpl(this, psession);
- listenerState = sessionState;
- statsProvider.bind(state.getNodeId(), sessionState);
- LOG.info("Session with {} attached to topology node {}", peerAddress, state.getNodeId());
+ listenerState = stateRegistry.bind(nodeId, new SessionStateImpl(this, psession));
+ LOG.info("Session with {} attached to topology node {}", peerAddress, nodeId);
}
}
}
LOG.error("Session {} cannot be closed.", psession, e);
}
session = null;
- listenerState = null;
syncOptimization = null;
clearRequests();
}
session.close(TerminationReason.UNKNOWN);
session = null;
}
- listenerState = null;
syncOptimization = null;
clearRequests();
}
@Holding({"this.serverSessionManager", "this"})
private void clearNodeState() {
if (nodeState != null) {
- statsProvider.unbind(nodeState.getNodeId());
LOG.debug("Clear Node state: {}", nodeState.getNodeId());
+ if (listenerState != null) {
+ listenerState.close();
+ listenerState = null;
+ }
nodeState = null;
}
}
final synchronized PCEPRequest removeRequest(final SrpIdNumber id) {
final PCEPRequest ret = requests.remove(id);
if (ret != null && listenerState != null) {
- listenerState.processRequestStats(ret.getElapsedMillis());
+ // FIXME: just update fields
+ listenerState.getInstance().processRequestStats(ret.getElapsedMillis());
}
LOG.trace("Removed request {} object {}", id, ret);
return ret;
final synchronized ListenableFuture<OperationResult> sendMessage(final Message message, final SrpIdNumber requestId,
final Metadata metadata) {
final var sendFuture = session.sendMessage(message);
- listenerState.updateStatefulSentMsg(message);
+ // FIXME: just update fields
+ listenerState().updateStatefulSentMsg(message);
// Note: the timeout is held back by us holding the 'this' monitor, which timeoutExpired re-acquires
final var timeout = serverSessionManager.newRpcTimeout(this::timeoutExpired, requestId);
boolean incrementalSynchro);
final boolean isLspDbPersisted() {
- return syncOptimization != null && syncOptimization.isSyncAvoidanceEnabled();
+ return syncOptimization != null && syncOptimization.syncAvoidanceEnabled();
}
/**
* LSP-DB-VERSION TLV values doesnt match, and LSP-SYNC-CAPABILITY is enabled.
*/
final synchronized boolean isIncrementalSynchro() {
- return syncOptimization != null && syncOptimization.isSyncAvoidanceEnabled()
- && syncOptimization.isDeltaSyncEnabled();
+ return syncOptimization != null && syncOptimization.syncAvoidanceEnabled()
+ && syncOptimization.deltaSyncEnabled();
}
final synchronized boolean isTriggeredInitialSynchro() {
- return syncOptimization != null && syncOptimization.isTriggeredInitSyncEnabled();
+ return syncOptimization != null && syncOptimization.triggeredInitialSyncEnabled();
}
final synchronized boolean isTriggeredReSyncEnabled() {
- return syncOptimization != null && syncOptimization.isTriggeredReSyncEnabled();
+ return syncOptimization != null && syncOptimization.triggeredReSyncEnabled();
}
protected final synchronized boolean isSynchronized() {
- return syncOptimization != null && syncOptimization.doesLspDbMatch();
+ return syncOptimization != null && syncOptimization.dbVersionMatch();
}
@Override
return lspUpdateCapability.get();
}
-
@Override
public synchronized ListenableFuture<RpcResult<Void>> tearDownSession(final TearDownSessionInput input) {
close();
return RpcResultBuilder.<Void>success().buildFuture();
}
+ final synchronized @NonNull SessionStateImpl listenerState() {
+ return verifyNotNull(listenerState).getInstance();
+ }
+
static final class MessageContext {
private final Collection<PCEPRequest> requests = new ArrayList<>();
private final WriteTransaction trans;
Code Review / bgpcep.git / blobdiff