X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fsharding%2FDistributedShardedDOMDataTree.java;h=53893e22510607f353ed46fda99dafc79fcbd584;hp=564fb978bee42cc41c4f87c2fa8f03a94fb0c57d;hb=fa60e0fbe54f1604d3b68dcd5df14ba3aed7183f;hpb=d65678cef128d33202318409ec52146722ae5318 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 564fb978be..53893e2251 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -25,6 +25,7 @@ import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Uninterruptibles; import java.util.AbstractMap.SimpleEntry; @@ -86,7 +87,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.compat.java8.FutureConverters; -import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.Promise; import scala.concurrent.duration.FiniteDuration; @@ -122,9 +122,6 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat private final DOMDataTreePrefixTable> shards = DOMDataTreePrefixTable.create(); - private final EnumMap defaultShardRegistrations = - new EnumMap<>(LogicalDatastoreType.class); - private final EnumMap> configurationShardMap = new EnumMap<>(LogicalDatastoreType.class); @@ -161,7 +158,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat createPrefixConfigShard(distributedOperDatastore); } - private void createPrefixConfigShard(final AbstractDataStore dataStore) { + private static void createPrefixConfigShard(final AbstractDataStore dataStore) { Configuration configuration = dataStore.getActorContext().getConfiguration(); Collection memberNames = configuration.getUniqueMemberNamesForAllShards(); CreateShard createShardMessage = @@ -195,21 +192,17 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat public void init() { // create our writers to the configuration try { - LOG.debug("{} - starting config shard lookup.", - distributedConfigDatastore.getActorContext().getCurrentMemberName()); + LOG.debug("{} - starting config shard lookup.", memberName); // We have to wait for prefix config shards to be up and running // so we can create datastore clients for them handleConfigShardLookup().get(SHARD_FUTURE_TIMEOUT_DURATION.length(), SHARD_FUTURE_TIMEOUT_DURATION.unit()); - - LOG.debug("Prefix configuration shards ready - creating clients"); - } catch (InterruptedException | ExecutionException | TimeoutException e) { throw new IllegalStateException("Prefix config shards not found", e); } try { - LOG.debug("Prefix configuration shards ready - creating clients"); + LOG.debug("{}: Prefix configuration shards ready - creating clients", memberName); configurationShardMap.put(LogicalDatastoreType.CONFIGURATION, createDatastoreClient(ClusterUtils.PREFIX_CONFIG_SHARD_ID, distributedConfigDatastore.getActorContext())); @@ -243,15 +236,13 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat //create shard registration for DEFAULT_SHARD try { - defaultShardRegistrations.put(LogicalDatastoreType.CONFIGURATION, - initDefaultShard(LogicalDatastoreType.CONFIGURATION)); + initDefaultShard(LogicalDatastoreType.CONFIGURATION); } catch (final InterruptedException | ExecutionException e) { throw new IllegalStateException("Unable to create default shard frontend for config shard", e); } try { - defaultShardRegistrations.put(LogicalDatastoreType.OPERATIONAL, - initDefaultShard(LogicalDatastoreType.OPERATIONAL)); + initDefaultShard(LogicalDatastoreType.OPERATIONAL); } catch (final InterruptedException | ExecutionException e) { throw new IllegalStateException("Unable to create default shard frontend for operational shard", e); } @@ -297,24 +288,24 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat @Nonnull @Override public DOMDataTreeProducer createProducer(@Nonnull final Collection subtrees) { - LOG.debug("{} - Creating producer for {}", - distributedConfigDatastore.getActorContext().getClusterWrapper().getCurrentMemberName(), subtrees); + LOG.debug("{} - Creating producer for {}", memberName, subtrees); final DOMDataTreeProducer producer = shardedDOMDataTree.createProducer(subtrees); final Object response = distributedConfigDatastore.getActorContext() .executeOperation(shardedDataTreeActor, new ProducerCreated(subtrees)); if (response == null) { - LOG.debug("{} - Received success from remote nodes, creating producer:{}", - distributedConfigDatastore.getActorContext().getClusterWrapper().getCurrentMemberName(), subtrees); + LOG.debug("{} - Received success from remote nodes, creating producer:{}", memberName, subtrees); return new ProxyProducer(producer, subtrees, shardedDataTreeActor, - distributedConfigDatastore.getActorContext()); - } else if (response instanceof Exception) { - closeProducer(producer); - throw Throwables.propagate((Exception) response); - } else { - closeProducer(producer); - throw new RuntimeException("Unexpected response to create producer received." + response); + distributedConfigDatastore.getActorContext(), shards); } + + closeProducer(producer); + + if (response instanceof Throwable) { + Throwables.throwIfUnchecked((Throwable) response); + throw new RuntimeException((Throwable) response); + } + throw new RuntimeException("Unexpected response to create producer received." + response); } @Override @@ -366,13 +357,13 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat shardRegistrationPromise.failure( new DOMDataTreeShardCreationFailedException("Unable to create a cds shard.", throwable)); } - }); + }, MoreExecutors.directExecutor()); return FutureConverters.toJava(shardRegistrationPromise.future()); } void resolveShardAdditions(final Set additions) { - LOG.debug("Member {}: Resolving additions : {}", memberName, additions); + LOG.debug("{}: Resolving additions : {}", memberName, additions); final ArrayList list = new ArrayList<>(additions); // we need to register the shards from top to bottom, so we need to atleast make sure the ordering reflects that Collections.sort(list, (o1, o2) -> { @@ -389,14 +380,14 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat } void resolveShardRemovals(final Set removals) { - LOG.debug("Member {}: Resolving removals : {}", memberName, removals); + LOG.debug("{}: Resolving removals : {}", memberName, removals); // do we need to go from bottom to top? removals.forEach(this::despawnShardFrontend); } private void createShardFrontend(final DOMDataTreeIdentifier prefix) { - LOG.debug("Member {}: Creating CDS shard for prefix: {}", memberName, prefix); + LOG.debug("{}: Creating CDS shard for prefix: {}", memberName, prefix); final String shardName = ClusterUtils.getCleanShardName(prefix.getRootIdentifier()); final AbstractDataStore distributedDataStore = prefix.getDatastoreType().equals(org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION) @@ -409,9 +400,8 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat final DistributedShardFrontend shard = new DistributedShardFrontend(distributedDataStore, entry.getKey(), prefix); - @SuppressWarnings("unchecked") final DOMDataTreeShardRegistration reg = - (DOMDataTreeShardRegistration) shardedDOMDataTree.registerDataTreeShard(prefix, shard, producer); + shardedDOMDataTree.registerDataTreeShard(prefix, shard, producer); synchronized (shards) { shards.store(prefix, reg); @@ -428,14 +418,14 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat } private void despawnShardFrontend(final DOMDataTreeIdentifier prefix) { - LOG.debug("Member {}: Removing CDS shard for prefix: {}", memberName, prefix); + LOG.debug("{}: Removing CDS shard for prefix: {}", memberName, prefix); final DOMDataTreePrefixTableEntry> lookup; synchronized (shards) { lookup = shards.lookup(prefix); } if (lookup == null || !lookup.getValue().getPrefix().equals(prefix)) { - LOG.debug("Member {}: Received despawn for non-existing CDS shard frontend, prefix: {}, ignoring..", + LOG.debug("{}: Received despawn for non-existing CDS shard frontend, prefix: {}, ignoring..", memberName, prefix); return; } @@ -451,15 +441,15 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat Futures.addCallback(future, new FutureCallback() { @Override - public void onSuccess(@Nullable Void result) { + public void onSuccess(@Nullable final Void result) { LOG.debug("{} - Succesfuly removed shard for {}", memberName, prefix); } @Override - public void onFailure(Throwable throwable) { + public void onFailure(final Throwable throwable) { LOG.error("Removal of shard {} from configuration failed.", prefix, throwable); } - }); + }, MoreExecutors.directExecutor()); } DOMDataTreePrefixTableEntry> lookupShardFrontend( @@ -495,7 +485,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat final String shardName, final ActorContext actorContext) throws DOMDataTreeShardCreationFailedException { - LOG.debug("Creating distributed datastore client for shard {}", shardName); + LOG.debug("{}: Creating distributed datastore client for shard {}", memberName, shardName); final Props distributedDataStoreClientProps = SimpleDataStoreClientActor.props(memberName, "Shard-" + shardName, actorContext, shardName); @@ -504,7 +494,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat return new SimpleEntry<>(SimpleDataStoreClientActor .getDistributedDataStoreClient(clientActor, 30, TimeUnit.SECONDS), clientActor); } catch (final Exception e) { - LOG.error("Failed to get actor for {}", distributedDataStoreClientProps, e); + LOG.error("{}: Failed to get actor for {}", distributedDataStoreClientProps, memberName, e); clientActor.tell(PoisonPill.getInstance(), noSender()); throw new DOMDataTreeShardCreationFailedException( "Unable to create datastore client for shard{" + shardName + "}", e); @@ -512,26 +502,21 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat } @SuppressWarnings("checkstyle:IllegalCatch") - private DistributedShardRegistration initDefaultShard(final LogicalDatastoreType logicalDatastoreType) + private void initDefaultShard(final LogicalDatastoreType logicalDatastoreType) throws ExecutionException, InterruptedException { - final Collection names = - distributedConfigDatastore.getActorContext().getConfiguration().getUniqueMemberNamesForAllShards(); final PrefixedShardConfigWriter writer = writerMap.get(logicalDatastoreType); if (writer.checkDefaultIsPresent()) { - LOG.debug("Default shard for {} is already present in the config. Possibly saved in snapshot.", - logicalDatastoreType); - return new DistributedShardRegistrationImpl( - new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), - shardedDataTreeActor, this); + LOG.debug("{}: Default shard for {} is already present in the config. Possibly saved in snapshot.", + memberName, logicalDatastoreType); } else { try { - // There can be situation when there is already started default shard - // because it is present in modules.conf. In that case we have to create - // just frontend for default shard, but not shard itself - // TODO we don't have to do it for config and operational default shard - // separately. Just one of them should be enough + // Currently the default shard configuration is present in the out-of-box modules.conf and is + // expected to be present. So look up the local default shard here and create the frontend. + + // TODO we don't have to do it for config and operational default shard separately. Just one of them + // should be enough final ActorContext actorContext = logicalDatastoreType == LogicalDatastoreType.CONFIGURATION ? distributedConfigDatastore.getActorContext() : distributedOperDatastore.getActorContext(); @@ -539,24 +524,27 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat actorContext.findLocalShard(ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); if (defaultLocalShardOptional.isPresent()) { - LOG.debug("{} Default shard is already started, creating just frontend", logicalDatastoreType); + LOG.debug("{}: Default shard for {} is already started, creating just frontend", memberName, + logicalDatastoreType); createShardFrontend(new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY)); - return new DistributedShardRegistrationImpl( - new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), - shardedDataTreeActor, this); } - // we should probably only have one node create the default shards - return Await.result(FutureConverters.toScala(createDistributedShard( - new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), names)), - SHARD_FUTURE_TIMEOUT_DURATION); - } catch (DOMDataTreeShardingConflictException e) { - LOG.debug("Default shard already registered, possibly due to other node doing it faster"); - return new DistributedShardRegistrationImpl( - new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), - shardedDataTreeActor, this); + // The local shard isn't present - we assume that means the local member isn't in the replica list + // and will be dynamically created later via an explicit add-shard-replica request. This is the + // bootstrapping mechanism to add a new node into an existing cluster. The following code to create + // the default shard as a prefix shard is problematic in this scenario so it is commented out. Since + // the default shard is a module-based shard by default, it makes sense to always treat it as such, + // ie bootstrap it in the same manner as the special prefix-configuration and EOS shards. +// final Collection names = distributedConfigDatastore.getActorContext().getConfiguration() +// .getUniqueMemberNamesForAllShards(); +// Await.result(FutureConverters.toScala(createDistributedShard( +// new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), names)), +// SHARD_FUTURE_TIMEOUT_DURATION); +// } catch (DOMDataTreeShardingConflictException e) { +// LOG.debug("{}: Default shard for {} already registered, possibly due to other node doing it faster", +// memberName, logicalDatastoreType); } catch (Exception e) { - LOG.error("{} default shard initialization failed", logicalDatastoreType, e); + LOG.error("{}: Default shard initialization for {} failed", memberName, logicalDatastoreType, e); throw new RuntimeException(e); } } @@ -642,14 +630,21 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat @GuardedBy("shardAccessMap") private final Map shardAccessMap = new HashMap<>(); + // We don't have to guard access to shardTable in ProxyProducer. + // ShardTable's entries relevant to this ProxyProducer shouldn't + // change during producer's lifetime. + private final DOMDataTreePrefixTable> shardTable; + ProxyProducer(final DOMDataTreeProducer delegate, final Collection subtrees, final ActorRef shardDataTreeActor, - final ActorContext actorContext) { + final ActorContext actorContext, + final DOMDataTreePrefixTable> shardLayout) { this.delegate = Preconditions.checkNotNull(delegate); this.subtrees = Preconditions.checkNotNull(subtrees); this.shardDataTreeActor = Preconditions.checkNotNull(shardDataTreeActor); this.actorContext = Preconditions.checkNotNull(actorContext); + this.shardTable = Preconditions.checkNotNull(shardLayout); } @Nonnull @@ -670,6 +665,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat @SuppressWarnings("checkstyle:IllegalCatch") public void close() throws DOMDataTreeProducerException { delegate.close(); + synchronized (shardAccessMap) { shardAccessMap.values().forEach(CDSShardAccessImpl::close); } @@ -690,19 +686,27 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat @Nonnull @Override public CDSShardAccess getShardAccess(@Nonnull final DOMDataTreeIdentifier subtree) { + Preconditions.checkArgument( + subtrees.stream().anyMatch(dataTreeIdentifier -> dataTreeIdentifier.contains(subtree)), + "Subtree %s is not controlled by this producer %s", subtree, this); + + final DOMDataTreePrefixTableEntry> lookup = + shardTable.lookup(subtree); + Preconditions.checkState(lookup != null, "Subtree %s is not contained in any registered shard.", subtree); + + final DOMDataTreeIdentifier lookupId = lookup.getValue().getPrefix(); + synchronized (shardAccessMap) { - Preconditions.checkArgument(subtrees.contains(subtree), - "Subtree {} is not controlled by this producer {}", subtree, this); - if (shardAccessMap.get(subtree) != null) { - return shardAccessMap.get(subtree); + if (shardAccessMap.get(lookupId) != null) { + return shardAccessMap.get(lookupId); } // TODO Maybe we can have static factory method and return the same instance // for same subtrees. But maybe it is not needed since there can be only one // producer attached to some subtree at a time. And also how we can close ShardAccess // then - final CDSShardAccessImpl shardAccess = new CDSShardAccessImpl(subtree, actorContext); - shardAccessMap.put(subtree, shardAccess); + final CDSShardAccessImpl shardAccess = new CDSShardAccessImpl(lookupId, actorContext); + shardAccessMap.put(lookupId, shardAccess); return shardAccess; } }