*/
package org.opendaylight.controller.cluster.raft;
+import static java.util.Objects.requireNonNull;
+
import akka.japi.Procedure;
-import com.google.common.base.Preconditions;
import org.opendaylight.controller.cluster.DataPersistenceProvider;
import org.opendaylight.controller.cluster.DelegatingPersistentDataProvider;
import org.opendaylight.controller.cluster.PersistentDataProvider;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.PersistentPayload;
+import org.opendaylight.controller.cluster.raft.messages.PersistentPayload;
/**
* The DelegatingPersistentDataProvider used by RaftActor to override the configured persistent provider to
class RaftActorDelegatingPersistentDataProvider extends DelegatingPersistentDataProvider {
private final PersistentDataProvider persistentProvider;
- RaftActorDelegatingPersistentDataProvider(DataPersistenceProvider delegate,
- PersistentDataProvider persistentProvider) {
+ RaftActorDelegatingPersistentDataProvider(final DataPersistenceProvider delegate,
+ final PersistentDataProvider persistentProvider) {
super(delegate);
- this.persistentProvider = Preconditions.checkNotNull(persistentProvider);
+ this.persistentProvider = requireNonNull(persistentProvider);
}
@Override
- public <T> void persist(final T o, final Procedure<T> procedure) {
- if(getDelegate().isRecoveryApplicable()) {
- super.persist(o, procedure);
- } else {
- if(o instanceof ReplicatedLogEntry) {
- Payload payload = ((ReplicatedLogEntry)o).getData();
- if(payload instanceof PersistentPayload) {
- // We persist the Payload but not the ReplicatedLogEntry to avoid gaps in the journal indexes
- // on recovery if data persistence is later enabled.
- persistentProvider.persist(payload, p -> procedure.apply(o));
- } else {
- super.persist(o, procedure);
- }
+ public <T> void persist(final T entry, final Procedure<T> procedure) {
+ doPersist(entry, procedure, false);
+ }
+
+ @Override
+ public <T> void persistAsync(final T entry, final Procedure<T> procedure) {
+ doPersist(entry, procedure, true);
+ }
+
+ private <T> void doPersist(final T entry, final Procedure<T> procedure, final boolean async) {
+ if (!getDelegate().isRecoveryApplicable() && entry instanceof ReplicatedLogEntry replicatedLogEntry
+ && replicatedLogEntry.getData() instanceof PersistentPayload payload) {
+ // We persist the Payload but not the ReplicatedLogEntry to avoid gaps in the journal indexes on recovery
+ // if data persistence is later enabled.
+ if (async) {
+ persistentProvider.persistAsync(payload, p -> procedure.apply(entry));
} else {
- super.persist(o, procedure);
+ persistentProvider.persist(payload, p -> procedure.apply(entry));
}
+ } else if (async) {
+ super.persistAsync(entry, procedure);
+ } else {
+ super.persist(entry, procedure);
}
}
}