X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardmanager%2FShardInformation.java;h=ac870905adcf1e781d49da672fb7561a22d6b2f9;hb=refs%2Fchanges%2F16%2F87616%2F4;hp=0c892295a77888d5c635c380183db1b2fa67d10b;hpb=1b24ce7d52a5acb3bb48bb6ae0724c4909220039;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java index 0c892295a7..ac870905ad 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore.shardmanager; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Props; import akka.serialization.Serialization; -import com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import java.util.HashSet; import java.util.Iterator; @@ -18,7 +20,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import javax.annotation.Nullable; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.DatastoreContext; import org.opendaylight.controller.cluster.datastore.Shard; @@ -29,12 +31,13 @@ import org.opendaylight.controller.cluster.datastore.messages.PeerUp; import org.opendaylight.controller.cluster.datastore.shardmanager.ShardManager.OnShardInitialized; import org.opendaylight.controller.cluster.datastore.shardmanager.ShardManager.OnShardReady; import org.opendaylight.controller.cluster.raft.RaftState; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; +import org.opendaylight.yangtools.yang.data.api.schema.tree.ReadOnlyDataTree; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class ShardInformation { +@VisibleForTesting +public final class ShardInformation { private static final Logger LOG = LoggerFactory.getLogger(ShardInformation.class); private final Set onShardInitializedSet = new HashSet<>(); @@ -42,8 +45,14 @@ final class ShardInformation { private final ShardPeerAddressResolver addressResolver; private final ShardIdentifier shardId; private final String shardName; + + // This reference indirection is required to have the ability to update the SchemaContext + // inside actor props. Otherwise we would be keeping an old SchemaContext there, preventing + // it from becoming garbage. + private final AtomicShardContextProvider schemaContextProvider = new AtomicShardContextProvider(); private ActorRef actor; - private Optional localShardDataTree; + + private Optional localShardDataTree; private boolean leaderAvailable = false; // flag that determines if the actor is ready for business @@ -57,11 +66,11 @@ final class ShardInformation { private DatastoreContext datastoreContext; private Shard.AbstractBuilder builder; - private boolean isActiveMember = true; + private boolean activeMember = true; - ShardInformation(String shardName, ShardIdentifier shardId, - Map initialPeerAddresses, DatastoreContext datastoreContext, - Shard.AbstractBuilder builder, ShardPeerAddressResolver addressResolver) { + ShardInformation(final String shardName, final ShardIdentifier shardId, + final Map initialPeerAddresses, final DatastoreContext datastoreContext, + final Shard.AbstractBuilder builder, final ShardPeerAddressResolver addressResolver) { this.shardName = shardName; this.shardId = shardId; this.initialPeerAddresses = initialPeerAddresses; @@ -70,10 +79,9 @@ final class ShardInformation { this.addressResolver = addressResolver; } - Props newProps(SchemaContext schemaContext) { - Preconditions.checkNotNull(builder); - Props props = builder.id(shardId).peerAddresses(initialPeerAddresses).datastoreContext(datastoreContext) - .schemaContext(schemaContext).props(); + Props newProps() { + Props props = requireNonNull(builder).id(shardId).peerAddresses(initialPeerAddresses) + .datastoreContext(datastoreContext).schemaContextProvider(schemaContextProvider).props(); builder = null; return props; } @@ -82,12 +90,12 @@ final class ShardInformation { return shardName; } - @Nullable - ActorRef getActor() { + @VisibleForTesting + @Nullable public ActorRef getActor() { return actor; } - void setActor(ActorRef actor) { + void setActor(final ActorRef actor) { this.actor = actor; } @@ -95,11 +103,11 @@ final class ShardInformation { return shardId; } - void setLocalDataTree(Optional localShardDataTree) { - this.localShardDataTree = localShardDataTree; + void setLocalDataTree(final Optional dataTree) { + this.localShardDataTree = dataTree; } - Optional getLocalShardDataTree() { + Optional getLocalShardDataTree() { return localShardDataTree; } @@ -107,15 +115,15 @@ final class ShardInformation { return datastoreContext; } - void setDatastoreContext(DatastoreContext datastoreContext, ActorRef sender) { - this.datastoreContext = datastoreContext; + void setDatastoreContext(final DatastoreContext newDatastoreContext, final ActorRef sender) { + this.datastoreContext = newDatastoreContext; if (actor != null) { LOG.debug("Sending new DatastoreContext to {}", shardId); actor.tell(this.datastoreContext, sender); } } - void updatePeerAddress(String peerId, String peerAddress, ActorRef sender) { + void updatePeerAddress(final String peerId, final String peerAddress, final ActorRef sender) { LOG.info("updatePeerAddress for peer {} with address {}", peerId, peerAddress); if (actor != null) { @@ -128,13 +136,13 @@ final class ShardInformation { notifyOnShardInitializedCallbacks(); } - void peerDown(MemberName memberName, String peerId, ActorRef sender) { + void peerDown(final MemberName memberName, final String peerId, final ActorRef sender) { if (actor != null) { actor.tell(new PeerDown(memberName, peerId), sender); } } - void peerUp(MemberName memberName, String peerId, ActorRef sender) { + void peerUp(final MemberName memberName, final String peerId, final ActorRef sender) { if (actor != null) { actor.tell(new PeerUp(memberName, peerId), sender); } @@ -195,15 +203,15 @@ final class ShardInformation { } } - void addOnShardInitialized(OnShardInitialized onShardInitialized) { + void addOnShardInitialized(final OnShardInitialized onShardInitialized) { onShardInitializedSet.add(onShardInitialized); } - void removeOnShardInitialized(OnShardInitialized onShardInitialized) { + void removeOnShardInitialized(final OnShardInitialized onShardInitialized) { onShardInitializedSet.remove(onShardInitialized); } - void setRole(String newRole) { + void setRole(final String newRole) { this.role = newRole; notifyOnShardInitializedCallbacks(); @@ -213,7 +221,7 @@ final class ShardInformation { return role; } - void setFollowerSyncStatus(boolean syncStatus) { + void setFollowerSyncStatus(final boolean syncStatus) { this.followerSyncStatus = syncStatus; } @@ -227,10 +235,10 @@ final class ShardInformation { return false; } - boolean setLeaderId(String leaderId) { - final boolean changed = !Objects.equals(this.leaderId, leaderId); - this.leaderId = leaderId; - if (leaderId != null) { + boolean setLeaderId(final String newLeaderId) { + final boolean changed = !Objects.equals(this.leaderId, newLeaderId); + this.leaderId = newLeaderId; + if (newLeaderId != null) { this.leaderAvailable = true; } notifyOnShardInitializedCallbacks(); @@ -242,7 +250,7 @@ final class ShardInformation { return leaderId; } - void setLeaderAvailable(boolean leaderAvailable) { + void setLeaderAvailable(final boolean leaderAvailable) { this.leaderAvailable = leaderAvailable; if (leaderAvailable) { @@ -254,15 +262,37 @@ final class ShardInformation { return leaderVersion; } - void setLeaderVersion(short leaderVersion) { + void setLeaderVersion(final short leaderVersion) { this.leaderVersion = leaderVersion; } boolean isActiveMember() { - return isActiveMember; + return activeMember; + } + + void setActiveMember(final boolean isActiveMember) { + this.activeMember = isActiveMember; + } + + SchemaContext getSchemaContext() { + return schemaContextProvider.getSchemaContext(); + } + + void setSchemaContext(final SchemaContext schemaContext) { + schemaContextProvider.set(requireNonNull(schemaContext)); } - void setActiveMember(boolean isActiveMember) { - this.isActiveMember = isActiveMember; + @VisibleForTesting + Shard.AbstractBuilder getBuilder() { + return builder; } + + @Override + public String toString() { + return "ShardInformation [shardId=" + shardId + ", leaderAvailable=" + leaderAvailable + ", actorInitialized=" + + actorInitialized + ", followerSyncStatus=" + followerSyncStatus + ", role=" + role + ", leaderId=" + + leaderId + ", activeMember=" + activeMember + "]"; + } + + }