dcapwell commented on code in PR #47: URL: https://github.com/apache/cassandra-accord/pull/47#discussion_r1202926000
########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); Review Comment: can you add a useful error msg? ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; + state.acknowledged.setSuccess(null); + } + + AsyncResult<Void> acknowledgeFuture(long epoch) + { + return getOrCreate(epoch).acknowledged; + } + + void truncateUntil(long epoch) + { + Invariants.checkArgument(epoch <= maxEpoch()); Review Comment: can we add a useful error msg? ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) Review Comment: you are calling `getOrCreate`, so this can't be null right? ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); Review Comment: useful error msg plz ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; Review Comment: there are no locks here (yet, still looking at this one class)... what is the expected threading model? If this is single producer multi consumer, then the `setSuccess` should publish this pointer update, but access would need a volatile read first to fetch the latest state; but we do `synchronized` instead I only ask due to this being `public` ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; + state.acknowledged.setSuccess(null); + } + + AsyncResult<Void> acknowledgeFuture(long epoch) + { + return getOrCreate(epoch).acknowledged; + } + + void truncateUntil(long epoch) + { + Invariants.checkArgument(epoch <= maxEpoch()); + long minEpoch = minEpoch(); + int toTrim = Ints.checkedCast(epoch - minEpoch); + if (toTrim <=0) + return; + + epochs = new ArrayList<>(epochs.subList(toTrim, epochs.size())); + } + } + + public AbstractConfigurationService(Node.Id localId) + { + this.localId = localId; + } + + protected abstract EpochHistory createEpochHistory(); + + protected EpochState getOrCreateEpochState(long epoch) + { + return epochs.getOrCreate(epoch); + } + + @Override + public synchronized void registerListener(Listener listener) + { + listeners.add(listener); + } + + @Override + public synchronized Topology currentTopology() + { + return epochs.topologyFor(epochs.lastReceived); + } + + @Override + public synchronized Topology getTopologyForEpoch(long epoch) + { + return epochs.topologyFor(epoch); + } + + protected abstract void fetchTopologyInternal(long epoch); + + @Override + public synchronized void fetchTopologyForEpoch(long epoch) + { + if (epoch <= epochs.lastReceived) + return; + + fetchTopologyInternal(epoch); + } + + protected abstract void localSyncComplete(Topology topology); + + @Override + public synchronized void acknowledgeEpoch(EpochReady ready) + { + ready.metadata.addCallback(() -> epochs.acknowledge(ready)); + ready.coordination.addCallback(() -> localSyncComplete(epochs.getOrCreate(ready.epoch).topology)); Review Comment: semantic issue... if the metadata or coordinate result gets marked as failed... do we want to mark this epoch as complete / acknowledged? ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; + state.acknowledged.setSuccess(null); + } + + AsyncResult<Void> acknowledgeFuture(long epoch) + { + return getOrCreate(epoch).acknowledged; + } + + void truncateUntil(long epoch) + { + Invariants.checkArgument(epoch <= maxEpoch()); + long minEpoch = minEpoch(); + int toTrim = Ints.checkedCast(epoch - minEpoch); + if (toTrim <=0) + return; + + epochs = new ArrayList<>(epochs.subList(toTrim, epochs.size())); + } + } + + public AbstractConfigurationService(Node.Id localId) + { + this.localId = localId; + } + + protected abstract EpochHistory createEpochHistory(); + + protected EpochState getOrCreateEpochState(long epoch) + { + return epochs.getOrCreate(epoch); + } + + @Override + public synchronized void registerListener(Listener listener) + { + listeners.add(listener); + } + + @Override + public synchronized Topology currentTopology() + { + return epochs.topologyFor(epochs.lastReceived); + } + + @Override + public synchronized Topology getTopologyForEpoch(long epoch) Review Comment: this is nullable here... so can be confusing and likely lead to NPEs; feel we should return `AsyncResult` instead ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; + state.acknowledged.setSuccess(null); Review Comment: think this fails on double `set*` calls right? For TCM do we have exactly once semantics? Can it retry to make sure the notification is idempotent? ########## accord-core/src/main/java/accord/impl/AbstractConfigurationService.java: ########## @@ -0,0 +1,337 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.primitives.Ints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import accord.api.ConfigurationService; +import accord.local.Node; +import accord.topology.Topology; +import accord.utils.Invariants; +import accord.utils.async.AsyncResult; +import accord.utils.async.AsyncResults; + +public abstract class AbstractConfigurationService<EpochState extends AbstractConfigurationService.AbstractEpochState, + EpochHistory extends AbstractConfigurationService.AbstractEpochHistory<EpochState>> + implements ConfigurationService +{ + private static final Logger logger = LoggerFactory.getLogger(AbstractConfigurationService.class); + + protected final Node.Id localId; + + protected final EpochHistory epochs = createEpochHistory(); + + protected final List<Listener> listeners = new ArrayList<>(); + + public abstract static class AbstractEpochState + { + protected final long epoch; + protected final AsyncResult.Settable<Topology> received = AsyncResults.settable(); + protected final AsyncResult.Settable<Void> acknowledged = AsyncResults.settable(); + protected AsyncResult<Void> reads = null; + + protected Topology topology = null; + + public AbstractEpochState(long epoch) + { + this.epoch = epoch; + } + + public long epoch() + { + return epoch; + } + + @Override + public String toString() + { + return "EpochState{" + epoch + '}'; + } + } + + @VisibleForTesting + public abstract static class AbstractEpochHistory<EpochState extends AbstractEpochState> + { + // TODO (low priority): move pendingEpochs / FetchTopology into here? + private List<EpochState> epochs = new ArrayList<>(); + + protected long lastReceived = 0; + protected long lastAcknowledged = 0; + + protected abstract EpochState createEpochState(long epoch); + + long minEpoch() + { + return epochs.isEmpty() ? 0L : epochs.get(0).epoch; + } + + long maxEpoch() + { + int size = epochs.size(); + return size == 0 ? 0L : epochs.get(size - 1).epoch; + } + + @VisibleForTesting + EpochState atIndex(int idx) + { + return epochs.get(idx); + } + + @VisibleForTesting + int size() + { + return epochs.size(); + } + + EpochState getOrCreate(long epoch) + { + Invariants.checkArgument(epoch > 0); + if (epochs.isEmpty()) + { + EpochState state = createEpochState(epoch); + epochs.add(state); + return state; + } + + long minEpoch = minEpoch(); + if (epoch < minEpoch) + { + int prepend = Ints.checkedCast(minEpoch - epoch); + List<EpochState> next = new ArrayList<>(epochs.size() + prepend); + for (long addEpoch=epoch; addEpoch<minEpoch; addEpoch++) + next.add(createEpochState(addEpoch)); + next.addAll(epochs); + epochs = next; + minEpoch = minEpoch(); + Invariants.checkState(minEpoch == epoch); + } + long maxEpoch = maxEpoch(); + int idx = Ints.checkedCast(epoch - minEpoch); + + // add any missing epochs + for (long addEpoch = maxEpoch + 1; addEpoch <= epoch; addEpoch++) + epochs.add(createEpochState(addEpoch)); + + return epochs.get(idx); + } + + public void receive(Topology topology) + { + long epoch = topology.epoch(); + Invariants.checkState(lastReceived == epoch - 1 || epoch == 0 || lastReceived == 0); + lastReceived = epoch; + EpochState state = getOrCreate(epoch); + if (state != null) + { + state.topology = topology; + state.received.setSuccess(topology); + } + } + + AsyncResult<Topology> receiveFuture(long epoch) + { + return getOrCreate(epoch).received; + } + + Topology topologyFor(long epoch) + { + return getOrCreate(epoch).topology; + } + + public void acknowledge(EpochReady ready) + { + long epoch = ready.epoch; + Invariants.checkState(lastAcknowledged == epoch - 1 || epoch == 0 || lastAcknowledged == 0); + lastAcknowledged = epoch; + EpochState state = getOrCreate(epoch); + state.reads = ready.reads; + state.acknowledged.setSuccess(null); + } + + AsyncResult<Void> acknowledgeFuture(long epoch) + { + return getOrCreate(epoch).acknowledged; + } + + void truncateUntil(long epoch) + { + Invariants.checkArgument(epoch <= maxEpoch()); + long minEpoch = minEpoch(); + int toTrim = Ints.checkedCast(epoch - minEpoch); + if (toTrim <=0) + return; + + epochs = new ArrayList<>(epochs.subList(toTrim, epochs.size())); + } + } + + public AbstractConfigurationService(Node.Id localId) + { + this.localId = localId; + } + + protected abstract EpochHistory createEpochHistory(); + + protected EpochState getOrCreateEpochState(long epoch) + { + return epochs.getOrCreate(epoch); + } + + @Override + public synchronized void registerListener(Listener listener) + { + listeners.add(listener); + } + + @Override + public synchronized Topology currentTopology() + { + return epochs.topologyFor(epochs.lastReceived); + } + + @Override + public synchronized Topology getTopologyForEpoch(long epoch) + { + return epochs.topologyFor(epoch); + } + + protected abstract void fetchTopologyInternal(long epoch); + + @Override + public synchronized void fetchTopologyForEpoch(long epoch) + { + if (epoch <= epochs.lastReceived) + return; + + fetchTopologyInternal(epoch); + } + + protected abstract void localSyncComplete(Topology topology); + + @Override + public synchronized void acknowledgeEpoch(EpochReady ready) + { + ready.metadata.addCallback(() -> epochs.acknowledge(ready)); Review Comment: the code doesn't mark this as `@Nullable` but `accord.local.CommandStore#bootstrapper` sets this to `null`; which could lead to a NPE? -- 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]
