Support for retries in AtomicCounter. Enabled counter operation retries in ConsistentApplicationIdStore
Change-Id: I705c51b2efd7ecd928c64c7f8a16d1965198253c
diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAtomicCounterBuilder.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAtomicCounterBuilder.java
index c84cff0..97361db 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAtomicCounterBuilder.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAtomicCounterBuilder.java
@@ -1,5 +1,7 @@
package org.onosproject.store.consistent.impl;
+import java.util.concurrent.ScheduledExecutorService;
+
import org.onosproject.store.service.AsyncAtomicCounter;
import org.onosproject.store.service.AtomicCounter;
import org.onosproject.store.service.AtomicCounterBuilder;
@@ -15,6 +17,8 @@
private boolean partitionsEnabled = true;
private final Database partitionedDatabase;
private final Database inMemoryDatabase;
+ private boolean retryOnFailure = false;
+ private ScheduledExecutorService retryExecutor = null;
public DefaultAtomicCounterBuilder(Database inMemoryDatabase, Database partitionedDatabase) {
this.inMemoryDatabase = inMemoryDatabase;
@@ -36,13 +40,35 @@
@Override
public AtomicCounter build() {
+ validateInputs();
Database database = partitionsEnabled ? partitionedDatabase : inMemoryDatabase;
- return new DefaultAtomicCounter(name, database);
+ return new DefaultAtomicCounter(name, database, retryOnFailure, retryExecutor);
}
@Override
public AsyncAtomicCounter buildAsyncCounter() {
+ validateInputs();
Database database = partitionsEnabled ? partitionedDatabase : inMemoryDatabase;
- return new DefaultAsyncAtomicCounter(name, database);
+ return new DefaultAsyncAtomicCounter(name, database, retryOnFailure, retryExecutor);
+ }
+
+ @Override
+ public AtomicCounterBuilder withRetryOnFailure() {
+ retryOnFailure = true;
+ return this;
+ }
+
+ @Override
+ public AtomicCounterBuilder withRetryExecutor(ScheduledExecutorService executor) {
+ this.retryExecutor = executor;
+ return this;
+ }
+
+ private void validateInputs() {
+ if (retryOnFailure) {
+ if (retryExecutor == null) {
+ throw new IllegalArgumentException("RetryExecutor must be specified when retries are enabled");
+ }
+ }
}
}