* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore;
+import static java.util.Objects.requireNonNull;
+
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Status;
-import com.google.common.base.Preconditions;
+import akka.util.Timeout;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.concurrent.NotThreadSafe;
-import org.opendaylight.controller.cluster.datastore.DataTreeCohortActor.CanCommit;
-import org.opendaylight.controller.md.sal.dom.spi.AbstractRegistrationTree;
-import org.opendaylight.controller.md.sal.dom.spi.RegistrationTreeNode;
-import org.opendaylight.controller.md.sal.dom.spi.RegistrationTreeSnapshot;
+import java.util.concurrent.Executor;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.DOMDataTreeCandidate;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.spi.AbstractRegistrationTree;
+import org.opendaylight.mdsal.dom.spi.RegistrationTreeNode;
+import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Registry of user commit cohorts, which is responsible for handling registration and calculation
- * of affected cohorts based on {@link DataTreeCandidate}.
+ * of affected cohorts based on {@link DataTreeCandidate}. This class is NOT thread-safe.
*
*/
-@NotThreadSafe
class DataTreeCohortActorRegistry extends AbstractRegistrationTree<ActorRef> {
private static final Logger LOG = LoggerFactory.getLogger(DataTreeCohortActorRegistry.class);
private final Map<ActorRef, RegistrationTreeNode<ActorRef>> cohortToNode = new HashMap<>();
+ Collection<ActorRef> getCohortActors() {
+ return new ArrayList<>(cohortToNode.keySet());
+ }
- void registerCohort(ActorRef sender, RegisterCohort cohort) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ void registerCohort(final ActorRef sender, final RegisterCohort cohort) {
takeLock();
try {
final ActorRef cohortRef = cohort.getCohort();
sender.tell(new Status.Success(null), ActorRef.noSender());
}
- void removeCommitCohort(ActorRef sender, RemoveCohort message) {
+ void removeCommitCohort(final ActorRef sender, final RemoveCohort message) {
final ActorRef cohort = message.getCohort();
final RegistrationTreeNode<ActorRef> node = cohortToNode.get(cohort);
if (node != null) {
cohort.tell(PoisonPill.getInstance(), cohort);
}
- Collection<DataTreeCohortActor.CanCommit> createCanCommitMessages(String txId, DataTreeCandidate candidate,
- SchemaContext schema) {
+ List<DataTreeCohortActor.CanCommit> createCanCommitMessages(final TransactionIdentifier txId,
+ final DataTreeCandidate candidate, final SchemaContext schema) {
try (RegistrationTreeSnapshot<ActorRef> cohorts = takeSnapshot()) {
return new CanCommitMessageBuilder(txId, candidate, schema).perform(cohorts.getRootNode());
}
}
- void process(ActorRef sender, CohortRegistryCommand message) {
+ void process(final ActorRef sender, final CohortRegistryCommand message) {
if (message instanceof RegisterCohort) {
registerCohort(sender, (RegisterCohort) message);
} else if (message instanceof RemoveCohort) {
}
}
- static abstract class CohortRegistryCommand {
-
+ abstract static class CohortRegistryCommand {
private final ActorRef cohort;
- CohortRegistryCommand(ActorRef cohort) {
- this.cohort = Preconditions.checkNotNull(cohort);
+ CohortRegistryCommand(final ActorRef cohort) {
+ this.cohort = requireNonNull(cohort);
}
ActorRef getCohort() {
}
static class RegisterCohort extends CohortRegistryCommand {
-
private final DOMDataTreeIdentifier path;
- RegisterCohort(DOMDataTreeIdentifier path, ActorRef cohort) {
+ RegisterCohort(final DOMDataTreeIdentifier path, final ActorRef cohort) {
super(cohort);
this.path = path;
-
}
public DOMDataTreeIdentifier getPath() {
return path;
}
-
}
static class RemoveCohort extends CohortRegistryCommand {
-
- RemoveCohort(ActorRef cohort) {
+ RemoveCohort(final ActorRef cohort) {
super(cohort);
}
-
}
private static class CanCommitMessageBuilder {
-
- private final String txId;
+ private final Multimap<ActorRef, DOMDataTreeCandidate> actorToCandidates = ArrayListMultimap.create();
+ private final TransactionIdentifier txId;
private final DataTreeCandidate candidate;
private final SchemaContext schema;
- private final Collection<DataTreeCohortActor.CanCommit> messages =
- new ArrayList<>();
- CanCommitMessageBuilder(String txId, DataTreeCandidate candidate, SchemaContext schema) {
- this.txId = Preconditions.checkNotNull(txId);
- this.candidate = Preconditions.checkNotNull(candidate);
+ CanCommitMessageBuilder(final TransactionIdentifier txId, final DataTreeCandidate candidate,
+ final SchemaContext schema) {
+ this.txId = requireNonNull(txId);
+ this.candidate = requireNonNull(candidate);
this.schema = schema;
}
- private void lookupAndCreateCanCommits(List<PathArgument> args, int offset,
- RegistrationTreeNode<ActorRef> node) {
+ private void lookupAndCreateCanCommits(final List<PathArgument> args, final int offset,
+
final RegistrationTreeNode<ActorRef> node) {
if (args.size() != offset) {
final PathArgument arg = args.get(offset);
}
}
- private void lookupAndCreateCanCommits(YangInstanceIdentifier path, RegistrationTreeNode<ActorRef> regNode,
- DataTreeCandidateNode candNode) {
+ private void lookupAndCreateCanCommits(final YangInstanceIdentifier path,
+ final RegistrationTreeNode<ActorRef> regNode, final DataTreeCandidateNode candNode) {
if (candNode.getModificationType() == ModificationType.UNMODIFIED) {
LOG.debug("Skipping unmodified candidate {}", path);
return;
}
}
- private void createCanCommits(Collection<ActorRef> regs, YangInstanceIdentifier path,
- DataTreeCandidateNode node) {
- final DOMDataTreeCandidate candidate = DOMDataTreeCandidateTO.create(treeIdentifier(path), node);
+ private void createCanCommits(final Collection<ActorRef> regs, final YangInstanceIdentifier path,
+ final DataTreeCandidateNode node) {
+ final DOMDataTreeCandidate domCandidate = DOMDataTreeCandidateTO.create(treeIdentifier(path), node);
for (final ActorRef reg : regs) {
- final CanCommit message = new DataTreeCohortActor.CanCommit(txId, candidate, schema, reg);
- messages.add(message);
+ actorToCandidates.put(reg, domCandidate);
}
}
- private static DOMDataTreeIdentifier treeIdentifier(YangInstanceIdentifier path) {
+ private static DOMDataTreeIdentifier treeIdentifier(final YangInstanceIdentifier path) {
return new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, path);
}
-
private Collection<DataTreeCohortActor.CanCommit> perform(RegistrationTreeNode<ActorRef> rootNode) {
+
List<DataTreeCohortActor.CanCommit> perform(final RegistrationTreeNode<ActorRef> rootNode) {
final List<PathArgument> toLookup = candidate.getRootPath().getPathArguments();
lookupAndCreateCanCommits(toLookup, 0, rootNode);
+
+ final Map<ActorRef, Collection<DOMDataTreeCandidate>> mapView = actorToCandidates.asMap();
+ final List<DataTreeCohortActor.CanCommit> messages = new ArrayList<>(mapView.size());
+ for (Map.Entry<ActorRef, Collection<DOMDataTreeCandidate>> entry: mapView.entrySet()) {
+ messages.add(new DataTreeCohortActor.CanCommit(txId, entry.getValue(), schema, entry.getKey()));
+ }
+
return messages;
}
}
+ CompositeDataTreeCohort createCohort(final SchemaContext schemaContext, final TransactionIdentifier txId,
+ final Executor callbackExecutor, final Timeout commitStepTimeout) {
+ return new CompositeDataTreeCohort(this, txId, schemaContext, callbackExecutor, commitStepTimeout);
+ }
}
Code Review / controller.git / blobdiff