dcapwell commented on code in PR #87: URL: https://github.com/apache/cassandra-accord/pull/87#discussion_r1589753939
########## accord-core/src/test/java/accord/impl/basic/Journal.java: ########## @@ -0,0 +1,361 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package accord.impl.basic; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import accord.local.Node; +import accord.local.SerializerSupport; +import accord.messages.AbstractEpochRequest; +import accord.messages.Accept; +import accord.messages.Apply; +import accord.messages.BeginRecovery; +import accord.messages.Commit; +import accord.messages.LocalRequest; +import accord.messages.Message; +import accord.messages.MessageType; +import accord.messages.PreAccept; +import accord.messages.Propagate; +import accord.messages.ReplyContext; +import accord.messages.Request; +import accord.messages.TxnRequest; +import accord.primitives.Ballot; +import accord.primitives.TxnId; +import accord.utils.Invariants; +import org.agrona.collections.Long2ObjectHashMap; +import org.agrona.collections.LongArrayList; + +import static accord.messages.MessageType.ACCEPT_INVALIDATE_REQ; +import static accord.messages.MessageType.ACCEPT_REQ; +import static accord.messages.MessageType.APPLY_MAXIMAL_REQ; +import static accord.messages.MessageType.APPLY_MINIMAL_REQ; +import static accord.messages.MessageType.APPLY_THEN_WAIT_UNTIL_APPLIED_REQ; +import static accord.messages.MessageType.BEGIN_INVALIDATE_REQ; +import static accord.messages.MessageType.BEGIN_RECOVER_REQ; +import static accord.messages.MessageType.COMMIT_INVALIDATE_REQ; +import static accord.messages.MessageType.COMMIT_MAXIMAL_REQ; +import static accord.messages.MessageType.COMMIT_SLOW_PATH_REQ; +import static accord.messages.MessageType.INFORM_DURABLE_REQ; +import static accord.messages.MessageType.INFORM_OF_TXN_REQ; +import static accord.messages.MessageType.PRE_ACCEPT_REQ; +import static accord.messages.MessageType.PROPAGATE_APPLY_MSG; +import static accord.messages.MessageType.PROPAGATE_OTHER_MSG; +import static accord.messages.MessageType.PROPAGATE_PRE_ACCEPT_MSG; +import static accord.messages.MessageType.PROPAGATE_STABLE_MSG; +import static accord.messages.MessageType.SET_GLOBALLY_DURABLE_REQ; +import static accord.messages.MessageType.SET_SHARD_DURABLE_REQ; +import static accord.messages.MessageType.STABLE_FAST_PATH_REQ; +import static accord.messages.MessageType.STABLE_MAXIMAL_REQ; +import static accord.messages.MessageType.STABLE_SLOW_PATH_REQ; + +public class Journal implements LocalRequest.Handler, Runnable +{ + private static final TxnIdProvider EPOCH = msg -> ((AbstractEpochRequest<?>) msg).txnId; + private static final TxnIdProvider TXN = msg -> ((TxnRequest<?>) msg).txnId; + private static final TxnIdProvider LOCAL = msg -> ((LocalRequest<?>) msg).primaryTxnId(); + private static final TxnIdProvider INVL = msg -> ((Commit.Invalidate) msg).primaryTxnId(); + private static final Map<MessageType, TxnIdProvider> typeToProvider = ImmutableMap.<MessageType, TxnIdProvider>builder() + .put(PRE_ACCEPT_REQ, TXN) + .put(ACCEPT_REQ, TXN) + .put(ACCEPT_INVALIDATE_REQ, EPOCH) + .put(COMMIT_SLOW_PATH_REQ, TXN) + .put(COMMIT_MAXIMAL_REQ, TXN) + .put(STABLE_FAST_PATH_REQ, TXN) + .put(STABLE_SLOW_PATH_REQ, TXN) + .put(STABLE_MAXIMAL_REQ, TXN) + .put(COMMIT_INVALIDATE_REQ, INVL) + .put(APPLY_MINIMAL_REQ, TXN) + .put(APPLY_MAXIMAL_REQ, TXN) + .put(APPLY_THEN_WAIT_UNTIL_APPLIED_REQ, EPOCH) + .put(BEGIN_RECOVER_REQ, TXN) + .put(BEGIN_INVALIDATE_REQ, EPOCH) + .put(INFORM_OF_TXN_REQ, EPOCH) + .put(INFORM_DURABLE_REQ, TXN) + .put(SET_SHARD_DURABLE_REQ, EPOCH) + .put(SET_GLOBALLY_DURABLE_REQ, EPOCH) + .put(PROPAGATE_PRE_ACCEPT_MSG, LOCAL) + .put(PROPAGATE_STABLE_MSG, LOCAL) + .put(PROPAGATE_APPLY_MSG, LOCAL) + .put(PROPAGATE_OTHER_MSG, LOCAL) + .build(); + + private final Queue<RequestContext> unframedRequests = new ArrayDeque<>(); + private final LongArrayList waitForEpochs = new LongArrayList(); + private final Long2ObjectHashMap<ArrayList<RequestContext>> delayedRequests = new Long2ObjectHashMap<>(); + private final Map<TxnId, Map<MessageType, Message>> writes = new HashMap<>(); + private Node node; + + public void start(Node node) + { + this.node = node; + node.scheduler().recurring(this, 1, TimeUnit.MILLISECONDS); + } + + public void shutdown() + { + this.node = null; + } + + @Override + public void handle(LocalRequest<?> message, Node node) + { + if (message.type().hasSideEffects()) + { + // enqueue + unframedRequests.add(new RequestContext(message, () -> node.scheduler().now(() -> message.process(node)))); + return; + } + message.process(node); + } + + public void handle(Request request, Node.Id from, ReplyContext replyContext) + { + if (request.type() != null && request.type().hasSideEffects()) + { + // enqueue + unframedRequests.add(new RequestContext(request, () -> node.receive(request, from, replyContext))); + return; + } + node.receive(request, from, replyContext); + } + + private void save(Message request) + { + MessageType type = request.type(); + TxnIdProvider provider = typeToProvider.get(type); + Invariants.nonNull(provider, "Unknown type %s: %s", type, request); + TxnId txnId = provider.txnId(request); + writes.computeIfAbsent(txnId, ignore -> new HashMap<>()).put(type, request); + } + + public SerializerSupport.MessageProvider makeMessageProvider(TxnId txnId) + { + return new MessageProvider(txnId, writes.getOrDefault(txnId, Map.of())); + } + + @Override + public void run() + { + if (this.node == null) + return; + try + { + doRun(); + } + catch (Throwable t) + { + node.agent().onUncaughtException(t); + } + } + + private void doRun() + { + ArrayList<RequestContext> requests = null; + // check to see if any pending epochs are in + waitForEpochs.sort(null); + for (int i = 0; i < waitForEpochs.size(); i++) + { + long waitForEpoch = waitForEpochs.getLong(i); + if (!node.topology().hasEpoch(waitForEpoch)) + break; + List<RequestContext> delayed = delayedRequests.remove(waitForEpoch); + if (null == requests) requests = new ArrayList<>(delayed.size()); + requests.addAll(delayed); + } + waitForEpochs.removeIfLong(epoch -> !delayedRequests.containsKey(epoch)); + + // for anything queued, put into the pending epochs or schedule + RequestContext request; + while (null != (request = unframedRequests.poll())) + { + long waitForEpoch = request.waitForEpoch; + if (waitForEpoch != 0 && !node.topology().hasEpoch(waitForEpoch)) Review Comment: `waitForEpoch != 0 && ` was also fixed in the `AccordJournal` though not sure we ever hit that... we did in burn test and know `epoch=0` isn't valid (its the empty state) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
