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%2Fdatastore%2FShard.java;h=eeacdd9b6ffa9cb247c698d64c68936f8e594caa;hp=357df4ab8d819fbb7c5d46a0ea80ec025aa71200;hb=HEAD;hpb=d6bc529eaf624afe74d9bf9ee9ab0cb926bba576 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 357df4ab8d..1fcaa9d64d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -30,6 +30,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -39,6 +40,7 @@ import java.util.Map; import java.util.Optional; import java.util.OptionalLong; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.access.ABIVersion; @@ -50,8 +52,6 @@ import org.opendaylight.controller.cluster.access.commands.OutOfSequenceEnvelope import org.opendaylight.controller.cluster.access.commands.TransactionRequest; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; -import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; -import org.opendaylight.controller.cluster.access.concepts.Request; import org.opendaylight.controller.cluster.access.concepts.RequestEnvelope; import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.opendaylight.controller.cluster.access.concepts.RequestSuccess; @@ -64,7 +64,6 @@ import org.opendaylight.controller.cluster.common.actor.CommonConfig; import org.opendaylight.controller.cluster.common.actor.Dispatchers; import org.opendaylight.controller.cluster.common.actor.Dispatchers.DispatcherType; import org.opendaylight.controller.cluster.common.actor.MessageTracker; -import org.opendaylight.controller.cluster.common.actor.MessageTracker.Error; import org.opendaylight.controller.cluster.common.actor.MeteringBehavior; import org.opendaylight.controller.cluster.datastore.actors.JsonExportActor; import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; @@ -107,16 +106,15 @@ import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus; import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply; +import org.opendaylight.controller.cluster.raft.messages.Payload; import org.opendaylight.controller.cluster.raft.messages.RequestLeadership; import org.opendaylight.controller.cluster.raft.messages.ServerRemoved; -import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStoreProperties.ExportOnRecovery; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev231229.DataStoreProperties.ExportOnRecovery; import org.opendaylight.yangtools.concepts.Identifier; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; +import org.opendaylight.yangtools.yang.data.tree.api.DataTree; +import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException; +import org.opendaylight.yangtools.yang.data.tree.api.TreeType; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import scala.concurrent.duration.FiniteDuration; /** @@ -182,6 +180,7 @@ public class Shard extends RaftActor { private DatastoreContext datastoreContext; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardCommitCoordinator commitCoordinator; private long transactionCommitTimeout; @@ -192,6 +191,7 @@ public class Shard extends RaftActor { private final MessageTracker appendEntriesReplyTracker; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardTransactionActorFactory transactionActorFactory; private final ShardSnapshotCohort snapshotCohort; @@ -200,6 +200,7 @@ public class Shard extends RaftActor { private ShardSnapshot restoreFromSnapshot; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardTransactionMessageRetrySupport messageRetrySupport; @VisibleForTesting @@ -217,27 +218,23 @@ public class Shard extends RaftActor { private final ActorRef exportActor; + @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Akka class design") Shard(final AbstractBuilder builder) { super(builder.getId().toString(), builder.getPeerAddresses(), Optional.of(builder.getDatastoreContext().getShardRaftConfig()), DataStoreVersions.CURRENT_VERSION); - this.name = builder.getId().toString(); - this.shardName = builder.getId().getShardName(); - this.datastoreContext = builder.getDatastoreContext(); - this.restoreFromSnapshot = builder.getRestoreFromSnapshot(); - this.frontendMetadata = new FrontendMetadata(name); - this.exportOnRecovery = datastoreContext.getExportOnRecovery(); + name = builder.getId().toString(); + shardName = builder.getId().getShardName(); + datastoreContext = builder.getDatastoreContext(); + restoreFromSnapshot = builder.getRestoreFromSnapshot(); + frontendMetadata = new FrontendMetadata(name); + exportOnRecovery = datastoreContext.getExportOnRecovery(); - switch (exportOnRecovery) { - case Json: - exportActor = getContext().actorOf(JsonExportActor.props(builder.getSchemaContext(), - datastoreContext.getRecoveryExportBaseDir())); - break; - case Off: - default: - exportActor = null; - break; - } + exportActor = switch (exportOnRecovery) { + case Json -> getContext().actorOf(JsonExportActor.props(builder.getSchemaContext(), + datastoreContext.getRecoveryExportBaseDir())); + case Off -> null; + }; setPersistence(datastoreContext.isPersistent()); @@ -261,7 +258,7 @@ public class Shard extends RaftActor { getContext().become(new MeteringBehavior(this)); } - commitCoordinator = new ShardCommitCoordinator(store, LOG, this.name); + commitCoordinator = new ShardCommitCoordinator(store, LOG, name); setTransactionCommitTimeout(); @@ -277,16 +274,16 @@ public class Shard extends RaftActor { self(), getContext(), shardMBean, builder.getId().getShardName()); snapshotCohort = ShardSnapshotCohort.create(getContext(), builder.getId().getMemberName(), store, LOG, - this.name, datastoreContext); + name, datastoreContext); messageRetrySupport = new ShardTransactionMessageRetrySupport(this); - responseMessageSlicer = MessageSlicer.builder().logContext(this.name) + responseMessageSlicer = MessageSlicer.builder().logContext(name) .messageSliceSize(datastoreContext.getMaximumMessageSliceSize()) .fileBackedStreamFactory(getRaftActorContext().getFileBackedOutputStreamFactory()) .expireStateAfterInactivity(2, TimeUnit.MINUTES).build(); - requestMessageAssembler = MessageAssembler.builder().logContext(this.name) + requestMessageAssembler = MessageAssembler.builder().logContext(name) .fileBackedStreamFactory(getRaftActorContext().getFileBackedOutputStreamFactory()) .assembledMessageCallback((message, sender) -> self().tell(message, sender)) .expireStateAfterInactivity(datastoreContext.getRequestTimeout(), TimeUnit.NANOSECONDS).build(); @@ -302,7 +299,7 @@ public class Shard extends RaftActor { } private Optional createRoleChangeNotifier(final String shardId) { - ActorRef shardRoleChangeNotifier = this.getContext().actorOf( + ActorRef shardRoleChangeNotifier = getContext().actorOf( RoleChangeNotifier.getProps(shardId), shardId + "-notifier"); return Optional.of(shardRoleChangeNotifier); } @@ -335,11 +332,10 @@ public class Shard extends RaftActor { switch (exportOnRecovery) { case Json: if (message instanceof SnapshotOffer) { - exportActor.tell(new JsonExportActor.ExportSnapshot(store.readCurrentData().get(), name), - ActorRef.noSender()); - } else if (message instanceof ReplicatedLogEntry) { - exportActor.tell(new JsonExportActor.ExportJournal((ReplicatedLogEntry) message), + exportActor.tell(new JsonExportActor.ExportSnapshot(store.readCurrentData().orElseThrow(), name), ActorRef.noSender()); + } else if (message instanceof ReplicatedLogEntry replicatedLogEntry) { + exportActor.tell(new JsonExportActor.ExportJournal(replicatedLogEntry), ActorRef.noSender()); } else if (message instanceof RecoveryCompleted) { exportActor.tell(new JsonExportActor.FinishExport(name), ActorRef.noSender()); exportActor.tell(PoisonPill.getInstance(), ActorRef.noSender()); @@ -358,54 +354,37 @@ public class Shard extends RaftActor { @Override // non-final for TestShard protected void handleNonRaftCommand(final Object message) { - try (MessageTracker.Context context = appendEntriesReplyTracker.received(message)) { - final Optional maybeError = context.error(); + try (var context = appendEntriesReplyTracker.received(message)) { + final var maybeError = context.error(); if (maybeError.isPresent()) { LOG.trace("{} : AppendEntriesReply failed to arrive at the expected interval {}", persistenceId(), - maybeError.get()); + maybeError.orElseThrow()); } store.resetTransactionBatch(); - if (message instanceof RequestEnvelope) { - handleRequestEnvelope((RequestEnvelope)message); + if (message instanceof RequestEnvelope request) { + handleRequestEnvelope(request); } else if (MessageAssembler.isHandledMessage(message)) { handleRequestAssemblerMessage(message); - } else if (message instanceof ConnectClientRequest) { - handleConnectClient((ConnectClientRequest)message); - } else if (CreateTransaction.isSerializedType(message)) { - handleCreateTransaction(message); - } else if (message instanceof BatchedModifications) { - handleBatchedModifications((BatchedModifications)message); - } else if (message instanceof ForwardedReadyTransaction) { - handleForwardedReadyTransaction((ForwardedReadyTransaction) message); - } else if (message instanceof ReadyLocalTransaction) { - handleReadyLocalTransaction((ReadyLocalTransaction)message); - } else if (CanCommitTransaction.isSerializedType(message)) { - handleCanCommitTransaction(CanCommitTransaction.fromSerializable(message)); - } else if (CommitTransaction.isSerializedType(message)) { - handleCommitTransaction(CommitTransaction.fromSerializable(message)); - } else if (AbortTransaction.isSerializedType(message)) { - handleAbortTransaction(AbortTransaction.fromSerializable(message)); - } else if (CloseTransactionChain.isSerializedType(message)) { - closeTransactionChain(CloseTransactionChain.fromSerializable(message)); + } else if (message instanceof ConnectClientRequest request) { + handleConnectClient(request); } else if (message instanceof DataTreeChangedReply) { // Ignore reply - } else if (message instanceof RegisterDataTreeChangeListener) { - treeChangeSupport.onMessage((RegisterDataTreeChangeListener) message, isLeader(), hasLeader()); - } else if (message instanceof UpdateSchemaContext) { - updateSchemaContext((UpdateSchemaContext) message); - } else if (message instanceof PeerAddressResolved) { - PeerAddressResolved resolved = (PeerAddressResolved) message; + } else if (message instanceof RegisterDataTreeChangeListener request) { + treeChangeSupport.onMessage(request, isLeader(), hasLeader()); + } else if (message instanceof UpdateSchemaContext request) { + updateSchemaContext(request); + } else if (message instanceof PeerAddressResolved resolved) { setPeerAddress(resolved.getPeerId(), resolved.getPeerAddress()); } else if (TX_COMMIT_TIMEOUT_CHECK_MESSAGE.equals(message)) { commitTimeoutCheck(); - } else if (message instanceof DatastoreContext) { - onDatastoreContext((DatastoreContext)message); + } else if (message instanceof DatastoreContext request) { + onDatastoreContext(request); } else if (message instanceof RegisterRoleChangeListener) { - roleChangeNotifier.get().forward(message, context()); - } else if (message instanceof FollowerInitialSyncUpStatus) { - shardMBean.setFollowerInitialSyncStatus(((FollowerInitialSyncUpStatus) message).isInitialSyncDone()); + roleChangeNotifier.orElseThrow().forward(message, context()); + } else if (message instanceof FollowerInitialSyncUpStatus request) { + shardMBean.setFollowerInitialSyncStatus(request.isInitialSyncDone()); context().parent().tell(message, self()); } else if (GET_SHARD_MBEAN_MESSAGE.equals(message)) { sender().tell(getShardMBean(), self()); @@ -413,11 +392,8 @@ public class Shard extends RaftActor { sender().tell(store.getDataTree(), self()); } else if (message instanceof ServerRemoved) { context().parent().forward(message, context()); - } else if (ShardTransactionMessageRetrySupport.TIMER_MESSAGE_CLASS.isInstance(message)) { - messageRetrySupport.onTimerMessage(message); - } else if (message instanceof DataTreeCohortActorRegistry.CohortRegistryCommand) { - store.processCohortRegistryCommand(getSender(), - (DataTreeCohortActorRegistry.CohortRegistryCommand) message); + } else if (message instanceof DataTreeCohortActorRegistry.CohortRegistryCommand request) { + store.processCohortRegistryCommand(getSender(), request); } else if (message instanceof MakeLeaderLocal) { onMakeLeaderLocal(); } else if (RESUME_NEXT_PENDING_TRANSACTION.equals(message)) { @@ -425,7 +401,28 @@ public class Shard extends RaftActor { } else if (GetKnownClients.INSTANCE.equals(message)) { handleGetKnownClients(); } else if (!responseMessageSlicer.handleMessage(message)) { - super.handleNonRaftCommand(message); + // Ask-based protocol messages + if (CreateTransaction.isSerializedType(message)) { + handleCreateTransaction(message); + } else if (message instanceof BatchedModifications request) { + handleBatchedModifications(request); + } else if (message instanceof ForwardedReadyTransaction request) { + handleForwardedReadyTransaction(request); + } else if (message instanceof ReadyLocalTransaction request) { + handleReadyLocalTransaction(request); + } else if (CanCommitTransaction.isSerializedType(message)) { + handleCanCommitTransaction(CanCommitTransaction.fromSerializable(message)); + } else if (CommitTransaction.isSerializedType(message)) { + handleCommitTransaction(CommitTransaction.fromSerializable(message)); + } else if (AbortTransaction.isSerializedType(message)) { + handleAbortTransaction(AbortTransaction.fromSerializable(message)); + } else if (CloseTransactionChain.isSerializedType(message)) { + closeTransactionChain(CloseTransactionChain.fromSerializable(message)); + } else if (ShardTransactionMessageRetrySupport.TIMER_MESSAGE_CLASS.isInstance(message)) { + messageRetrySupport.onTimerMessage(message); + } else { + super.handleNonRaftCommand(message); + } } } } @@ -471,7 +468,7 @@ public class Shard extends RaftActor { } private OptionalLong updateAccess(final SimpleShardDataTreeCohort cohort) { - final FrontendIdentifier frontend = cohort.getIdentifier().getHistoryId().getClientId().getFrontendId(); + final FrontendIdentifier frontend = cohort.transactionId().getHistoryId().getClientId().getFrontendId(); final LeaderFrontendState state = knownFrontends.get(frontend); if (state == null) { // Not tell-based protocol, do nothing @@ -635,14 +632,12 @@ public class Shard extends RaftActor { throw new NotLeaderException(getSelf()); } - final Request request = envelope.getMessage(); - if (request instanceof TransactionRequest) { - final TransactionRequest txReq = (TransactionRequest)request; - final ClientIdentifier clientId = txReq.getTarget().getHistoryId().getClientId(); + final var request = envelope.getMessage(); + if (request instanceof TransactionRequest txReq) { + final var clientId = txReq.getTarget().getHistoryId().getClientId(); return getFrontend(clientId).handleTransactionRequest(txReq, envelope, now); - } else if (request instanceof LocalHistoryRequest) { - final LocalHistoryRequest lhReq = (LocalHistoryRequest)request; - final ClientIdentifier clientId = lhReq.getTarget().getClientId(); + } else if (request instanceof LocalHistoryRequest lhReq) { + final var clientId = lhReq.getTarget().getClientId(); return getFrontend(clientId).handleLocalHistoryRequest(lhReq, envelope, now); } else { LOG.warn("{}: rejecting unsupported request {}", persistenceId(), request); @@ -712,13 +707,14 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCommitTransaction(final CommitTransaction commit) { - final TransactionIdentifier txId = commit.getTransactionId(); + final var txId = commit.getTransactionId(); if (isLeader()) { askProtocolEncountered(txId); commitCoordinator.handleCommit(txId, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (leader == null) { messageRetrySupport.addMessageToRetry(commit, getSender(), "Could not commit transaction " + txId); } else { @@ -728,15 +724,16 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCanCommitTransaction(final CanCommitTransaction canCommit) { - final TransactionIdentifier txId = canCommit.getTransactionId(); + final var txId = canCommit.getTransactionId(); LOG.debug("{}: Can committing transaction {}", persistenceId(), txId); if (isLeader()) { askProtocolEncountered(txId); commitCoordinator.handleCanCommit(txId, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (leader == null) { messageRetrySupport.addMessageToRetry(canCommit, getSender(), "Could not canCommit transaction " + txId); @@ -748,6 +745,7 @@ public class Shard extends RaftActor { } @SuppressWarnings("checkstyle:IllegalCatch") + @Deprecated(since = "9.0.0", forRemoval = true) private void handleBatchedModificationsLocal(final BatchedModifications batched, final ActorRef sender) { askProtocolEncountered(batched.getTransactionId()); @@ -760,6 +758,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleBatchedModifications(final BatchedModifications batched) { // This message is sent to prepare the modifications transaction directly on the Shard as an // optimization to avoid the extra overhead of a separate ShardTransaction actor. On the last @@ -777,7 +776,7 @@ public class Shard extends RaftActor { if (isLeader() && isLeaderActive) { handleBatchedModificationsLocal(batched, getSender()); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(batched, getSender(), "Could not process BatchedModifications " + batched.getTransactionId()); @@ -786,9 +785,8 @@ public class Shard extends RaftActor { // we need to reconstruct previous BatchedModifications from the transaction // DataTreeModification, honoring the max batched modification count, and forward all the // previous BatchedModifications to the new leader. - Collection newModifications = commitCoordinator - .createForwardedBatchedModifications(batched, - datastoreContext.getShardBatchedModificationCount()); + final var newModifications = commitCoordinator.createForwardedBatchedModifications(batched, + datastoreContext.getShardBatchedModificationCount()); LOG.debug("{}: Forwarding {} BatchedModifications to leader {}", persistenceId(), newModifications.size(), leader); @@ -817,23 +815,25 @@ public class Shard extends RaftActor { } @SuppressWarnings("checkstyle:IllegalCatch") - private void handleReadyLocalTransaction(final ReadyLocalTransaction message) { - LOG.debug("{}: handleReadyLocalTransaction for {}", persistenceId(), message.getTransactionId()); + @Deprecated(since = "9.0.0", forRemoval = true) + private void handleReadyLocalTransaction(final ReadyLocalTransaction message) { + final var txId = message.getTransactionId(); + LOG.debug("{}: handleReadyLocalTransaction for {}", persistenceId(), txId); - boolean isLeaderActive = isLeaderActive(); + final var isLeaderActive = isLeaderActive(); if (isLeader() && isLeaderActive) { + askProtocolEncountered(txId); try { commitCoordinator.handleReadyLocalTransaction(message, getSender(), this); } catch (Exception e) { - LOG.error("{}: Error handling ReadyLocalTransaction for Tx {}", persistenceId(), - message.getTransactionId(), e); + LOG.error("{}: Error handling ReadyLocalTransaction for Tx {}", persistenceId(), txId, e); getSender().tell(new Failure(e), getSelf()); } } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(message, getSender(), - "Could not process ready local transaction " + message.getTransactionId()); + "Could not process ready local transaction " + txId); } else { LOG.debug("{}: Forwarding ReadyLocalTransaction to leader {}", persistenceId(), leader); message.setRemoteVersion(getCurrentBehavior().getLeaderPayloadVersion()); @@ -842,22 +842,23 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleForwardedReadyTransaction(final ForwardedReadyTransaction forwardedReady) { LOG.debug("{}: handleForwardedReadyTransaction for {}", persistenceId(), forwardedReady.getTransactionId()); - boolean isLeaderActive = isLeaderActive(); + final var isLeaderActive = isLeaderActive(); if (isLeader() && isLeaderActive) { askProtocolEncountered(forwardedReady.getTransactionId()); commitCoordinator.handleForwardedReadyTransaction(forwardedReady, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(forwardedReady, getSender(), "Could not process forwarded ready transaction " + forwardedReady.getTransactionId()); } else { LOG.debug("{}: Forwarding ForwardedReadyTransaction to leader {}", persistenceId(), leader); - ReadyLocalTransaction readyLocal = new ReadyLocalTransaction(forwardedReady.getTransactionId(), + final var readyLocal = new ReadyLocalTransaction(forwardedReady.getTransactionId(), forwardedReady.getTransaction().getSnapshot(), forwardedReady.isDoImmediateCommit(), forwardedReady.getParticipatingShardNames()); readyLocal.setRemoteVersion(getCurrentBehavior().getLeaderPayloadVersion()); @@ -866,8 +867,9 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleAbortTransaction(final AbortTransaction abort) { - final TransactionIdentifier transactionId = abort.getTransactionId(); + final var transactionId = abort.getTransactionId(); askProtocolEncountered(transactionId); doAbortTransaction(transactionId, getSender()); } @@ -876,6 +878,7 @@ public class Shard extends RaftActor { commitCoordinator.handleAbort(transactionID, sender, this); } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCreateTransaction(final Object message) { if (isLeader()) { createTransaction(CreateTransaction.fromSerializable(message)); @@ -887,9 +890,10 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void closeTransactionChain(final CloseTransactionChain closeTransactionChain) { if (isLeader()) { - final LocalHistoryIdentifier id = closeTransactionChain.getIdentifier(); + final var id = closeTransactionChain.getIdentifier(); askProtocolEncountered(id.getClientId()); store.closeTransactionChain(id); } else if (getLeader() != null) { @@ -899,6 +903,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) @SuppressWarnings("checkstyle:IllegalCatch") private void createTransaction(final CreateTransaction createTransaction) { askProtocolEncountered(createTransaction.getTransactionId()); @@ -909,7 +914,7 @@ public class Shard extends RaftActor { return; } - ActorRef transactionActor = createTransaction(createTransaction.getTransactionType(), + final var transactionActor = createTransaction(createTransaction.getTransactionType(), createTransaction.getTransactionId()); getSender().tell(new CreateTransactionReply(Serialization.serializedActorPath(transactionActor), @@ -919,6 +924,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private ActorRef createTransaction(final int transactionType, final TransactionIdentifier transactionId) { LOG.debug("{}: Creating transaction : {} ", persistenceId(), transactionId); return transactionActorFactory.newShardTransaction(TransactionType.fromInt(transactionType), @@ -926,14 +932,16 @@ public class Shard extends RaftActor { } // Called on leader only + @Deprecated(since = "9.0.0", forRemoval = true) private void askProtocolEncountered(final TransactionIdentifier transactionId) { askProtocolEncountered(transactionId.getHistoryId().getClientId()); } // Called on leader only + @Deprecated(since = "9.0.0", forRemoval = true) private void askProtocolEncountered(final ClientIdentifier clientId) { - final FrontendIdentifier frontend = clientId.getFrontendId(); - final LeaderFrontendState state = knownFrontends.get(frontend); + final var frontend = clientId.getFrontendId(); + final var state = knownFrontends.get(frontend); if (!(state instanceof LeaderFrontendState.Disabled)) { LOG.debug("{}: encountered ask-based client {}, disabling transaction tracking", persistenceId(), clientId); if (knownFrontends.isEmpty()) { @@ -947,7 +955,7 @@ public class Shard extends RaftActor { } private void updateSchemaContext(final UpdateSchemaContext message) { - updateSchemaContext(message.getEffectiveModelContext()); + updateSchemaContext(message.modelContext()); } @VisibleForTesting @@ -980,13 +988,13 @@ public class Shard extends RaftActor { restoreFromSnapshot = null; //notify shard manager - getContext().parent().tell(new ActorInitialized(), getSelf()); + getContext().parent().tell(new ActorInitialized(getSelf()), ActorRef.noSender()); // Being paranoid here - this method should only be called once but just in case... if (txCommitTimeoutCheckSchedule == null) { // Schedule a message to be periodically sent to check if the current in-progress // transaction should be expired and aborted. - FiniteDuration period = FiniteDuration.create(transactionCommitTimeout / 3, TimeUnit.MILLISECONDS); + final var period = FiniteDuration.create(transactionCommitTimeout / 3, TimeUnit.MILLISECONDS); txCommitTimeoutCheckSchedule = getContext().system().scheduler().schedule( period, period, getSelf(), TX_COMMIT_TIMEOUT_CHECK_MESSAGE, getContext().dispatcher(), ActorRef.noSender()); @@ -995,14 +1003,14 @@ public class Shard extends RaftActor { @Override protected final void applyState(final ActorRef clientActor, final Identifier identifier, final Object data) { - if (data instanceof Payload) { - if (data instanceof DisableTrackingPayload) { - disableTracking((DisableTrackingPayload) data); + if (data instanceof Payload payload) { + if (payload instanceof DisableTrackingPayload disableTracking) { + disableTracking(disableTracking); return; } try { - store.applyReplicatedPayload(identifier, (Payload)data); + store.applyReplicatedPayload(identifier, payload); } catch (DataValidationFailedException | IOException e) { LOG.error("{}: Error applying replica {}", persistenceId(), identifier, e); } @@ -1091,10 +1099,8 @@ public class Shard extends RaftActor { paused = true; // Tell-based protocol can replay transaction state, so it is safe to blow it up when we are paused. - if (datastoreContext.isUseTellBasedProtocol()) { - knownFrontends.values().forEach(LeaderFrontendState::retire); - knownFrontends = ImmutableMap.of(); - } + knownFrontends.values().forEach(LeaderFrontendState::retire); + knownFrontends = ImmutableMap.of(); store.setRunOnPendingTransactionsComplete(operation); } @@ -1119,7 +1125,7 @@ public class Shard extends RaftActor { @Override public final String persistenceId() { - return this.name; + return name; } @Override @@ -1162,7 +1168,7 @@ public class Shard extends RaftActor { private ShardIdentifier id; private Map peerAddresses = Collections.emptyMap(); private DatastoreContext datastoreContext; - private EffectiveModelContextProvider schemaContextProvider; + private Supplier<@NonNull EffectiveModelContext> schemaContextProvider; private DatastoreSnapshot.ShardSnapshot restoreFromSnapshot; private DataTree dataTree; @@ -1183,37 +1189,37 @@ public class Shard extends RaftActor { public T id(final ShardIdentifier newId) { checkSealed(); - this.id = newId; + id = newId; return self(); } public T peerAddresses(final Map newPeerAddresses) { checkSealed(); - this.peerAddresses = newPeerAddresses; + peerAddresses = newPeerAddresses; return self(); } public T datastoreContext(final DatastoreContext newDatastoreContext) { checkSealed(); - this.datastoreContext = newDatastoreContext; + datastoreContext = newDatastoreContext; return self(); } - public T schemaContextProvider(final EffectiveModelContextProvider newSchemaContextProvider) { + public T schemaContextProvider(final Supplier<@NonNull EffectiveModelContext> newSchemaContextProvider) { checkSealed(); - this.schemaContextProvider = requireNonNull(newSchemaContextProvider); + schemaContextProvider = requireNonNull(newSchemaContextProvider); return self(); } public T restoreFromSnapshot(final DatastoreSnapshot.ShardSnapshot newRestoreFromSnapshot) { checkSealed(); - this.restoreFromSnapshot = newRestoreFromSnapshot; + restoreFromSnapshot = newRestoreFromSnapshot; return self(); } public T dataTree(final DataTree newDataTree) { checkSealed(); - this.dataTree = newDataTree; + dataTree = newDataTree; return self(); } @@ -1230,7 +1236,7 @@ public class Shard extends RaftActor { } public EffectiveModelContext getSchemaContext() { - return verifyNotNull(schemaContextProvider.getEffectiveModelContext()); + return verifyNotNull(schemaContextProvider.get()); } public DatastoreSnapshot.ShardSnapshot getRestoreFromSnapshot() { @@ -1242,15 +1248,10 @@ public class Shard extends RaftActor { } public TreeType getTreeType() { - switch (datastoreContext.getLogicalStoreType()) { - case CONFIGURATION: - return TreeType.CONFIGURATION; - case OPERATIONAL: - return TreeType.OPERATIONAL; - default: - throw new IllegalStateException("Unhandled logical store type " - + datastoreContext.getLogicalStoreType()); - } + return switch (datastoreContext.getLogicalStoreType()) { + case CONFIGURATION -> TreeType.CONFIGURATION; + case OPERATIONAL -> TreeType.OPERATIONAL; + }; } protected void verify() {