import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFailedFluentFuture;
import com.google.common.util.concurrent.FluentFuture;
-import com.google.common.util.concurrent.Futures;
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.SettableFuture;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.function.Function;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.spi.UncancellableListenableFuture;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
AbstractDOMForwardedTransactionFactory> IMPL_UPDATER = AtomicReferenceFieldUpdater.newUpdater(
DOMForwardedWriteTransaction.class, AbstractDOMForwardedTransactionFactory.class, "commitImpl");
@SuppressWarnings("rawtypes")
- private static final AtomicReferenceFieldUpdater<DOMForwardedWriteTransaction, Future> FUTURE_UPDATER =
- AtomicReferenceFieldUpdater.newUpdater(DOMForwardedWriteTransaction.class, Future.class, "commitFuture");
+ private static final AtomicReferenceFieldUpdater<DOMForwardedWriteTransaction, FluentFuture> FUTURE_UPDATER =
+ AtomicReferenceFieldUpdater.newUpdater(DOMForwardedWriteTransaction.class, FluentFuture.class,
+ "commitFuture");
private static final Logger LOG = LoggerFactory.getLogger(DOMForwardedWriteTransaction.class);
- private static final Future<?> CANCELLED_FUTURE = Futures.immediateCancelledFuture();
+
+ private final @NonNull SettableFuture<@NonNull CommitInfo> settableCompletion = SettableFuture.create();
+ private final @NonNull FluentFuture<? extends @NonNull CommitInfo> completionFuture = FluentFuture.from(
+ new UncancellableListenableFuture<>(settableCompletion));
/*
* Implementation of real commit. It also acts as an indication that the transaction is running -- which we flip
* busy-wait for it. The fast path gets the benefit of a store-store barrier instead of the usual store-load
* barrier.
*/
- private volatile Future<?> commitFuture;
+ private volatile FluentFuture<?> commitFuture;
protected DOMForwardedWriteTransaction(final Object identifier,
final Function<LogicalDatastoreType, T> backingTxFactory,
}
@Override
- public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) {
+ public final void put(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+ final NormalizedNode data) {
checkRunning(commitImpl);
getSubtransaction(store).write(path, data);
}
@Override
- public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
+ public final void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
checkRunning(commitImpl);
getSubtransaction(store).delete(path);
}
@Override
- public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) {
+ public final void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+ final NormalizedNode data) {
checkRunning(commitImpl);
getSubtransaction(store).merge(path, data);
}
@Override
- public boolean cancel() {
+ public final boolean cancel() {
final AbstractDOMForwardedTransactionFactory<?> impl = IMPL_UPDATER.getAndSet(this, null);
if (impl != null) {
LOG.trace("Transaction {} cancelled before submit", getIdentifier());
- FUTURE_UPDATER.lazySet(this, CANCELLED_FUTURE);
+ FUTURE_UPDATER.lazySet(this, FluentFutures.immediateCancelledFluentFuture());
closeSubtransactions();
return true;
}
- // The transaction is in process of being submitted or cancelled. Busy-wait
- // for the corresponding future.
- Future<?> future;
+ // The transaction is in process of being submitted or cancelled. Busy-wait for the corresponding future.
+ FluentFuture<?> future;
do {
future = commitFuture;
} while (future == null);
- return future.cancel(false);
+ return future.isCancelled();
}
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- public @NonNull FluentFuture<? extends @NonNull CommitInfo> commit() {
+ public final FluentFuture<? extends CommitInfo> commit() {
final AbstractDOMForwardedTransactionFactory<?> impl = IMPL_UPDATER.getAndSet(this, null);
checkRunning(impl);
}
}
+ settableCompletion.setFuture(ret);
FUTURE_UPDATER.lazySet(this, ret);
- return ret;
+ return completionFuture;
+ }
+
+ @Override
+ public final FluentFuture<?> completionFuture() {
+ return completionFuture;
}
private void checkRunning(final AbstractDOMForwardedTransactionFactory<?> impl) {
--- /dev/null
+/*
+ * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.mdsal.dom.spi;
+
+import com.google.common.annotations.Beta;
+import com.google.common.util.concurrent.ForwardingListenableFuture.SimpleForwardingListenableFuture;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Beta
+public final class UncancellableListenableFuture<V> extends SimpleForwardingListenableFuture<V> {
+ private static final Logger LOG = LoggerFactory.getLogger(UncancellableListenableFuture.class);
+
+ public UncancellableListenableFuture(final ListenableFuture<V> delegate) {
+ super(delegate);
+ }
+
+ @Override
+ public boolean cancel(final boolean mayInterruptIfRunning) {
+ LOG.debug("Attempted to cancel future", new Throwable());
+ return false;
+ }
+}
Code Review / mdsal.git / commitdiff