summaryrefslogtreecommitdiffstats
path: root/vpp-common/vpp-translate-utils/src
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-04-18 09:52:15 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-04-24 07:31:25 +0000
commite4139584aaf94df71a4ddb5e5a0dded1a80c249d (patch)
treee8d7bc381a294e90c7fda6e00abb501b30fee19f /vpp-common/vpp-translate-utils/src
parent458b915ad1d980f0b1ade7ebbd741d4cd46d5473 (diff)
HC2VPP-106 - jvpp timeout configuration
Allows dynamic configuration of jvpp timeout Change-Id: Iab113ec33f1efd8d150f0e525ef548a64ebf1a0b Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'vpp-common/vpp-translate-utils/src')
-rw-r--r--vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java41
1 files changed, 33 insertions, 8 deletions
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java
index d55446c82..2a8345445 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java
@@ -20,6 +20,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException;
import io.fd.honeycomb.translate.write.WriteFailedException;
import io.fd.vpp.jvpp.VppBaseCallException;
import io.fd.vpp.jvpp.dto.JVppReply;
+import java.util.Optional;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -29,16 +30,17 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
/**
* Trait providing logic for consuming reply's to jvpp api calls
*/
public interface JvppReplyConsumer {
- int DEFAULT_TIMEOUT_IN_SECONDS = 5;
-
JvppReplyConsumer INSTANCE = new JvppReplyConsumer() {
};
@@ -50,7 +52,8 @@ public interface JvppReplyConsumer {
default <REP extends JVppReply<?>> REP getReplyForWrite(@Nonnull Future<REP> future,
@Nonnull final InstanceIdentifier<?> replyType)
throws WriteFailedException {
- return getReplyForWrite(future, replyType, DEFAULT_TIMEOUT_IN_SECONDS);
+
+ return getReplyForWrite(future, replyType, JvppReplyTimeoutHolder.getTimeout());
}
/**
@@ -79,7 +82,7 @@ public interface JvppReplyConsumer {
@Nonnull final InstanceIdentifier<?> replyType,
@Nonnull final DataObject data)
throws WriteFailedException {
- return getReplyForCreate(future, replyType, data, DEFAULT_TIMEOUT_IN_SECONDS);
+ return getReplyForCreate(future, replyType, data, JvppReplyTimeoutHolder.getTimeout());
}
/**
@@ -107,7 +110,7 @@ public interface JvppReplyConsumer {
@Nonnull final DataObject dataBefore,
@Nonnull final DataObject dataAfter)
throws WriteFailedException {
- return getReplyForUpdate(future, replyType, dataBefore, dataAfter, DEFAULT_TIMEOUT_IN_SECONDS);
+ return getReplyForUpdate(future, replyType, dataBefore, dataAfter, JvppReplyTimeoutHolder.getTimeout());
}
/**
@@ -134,7 +137,7 @@ public interface JvppReplyConsumer {
default <REP extends JVppReply<?>> REP getReplyForDelete(@Nonnull Future<REP> future,
@Nonnull final InstanceIdentifier<?> replyType)
throws WriteFailedException {
- return getReplyForDelete(future, replyType, DEFAULT_TIMEOUT_IN_SECONDS);
+ return getReplyForDelete(future, replyType, JvppReplyTimeoutHolder.getTimeout());
}
/**
@@ -156,7 +159,7 @@ public interface JvppReplyConsumer {
default <REP extends JVppReply<?>> REP getReplyForRead(@Nonnull Future<REP> future,
@Nonnull final InstanceIdentifier<?> replyType)
throws ReadFailedException {
- return getReplyForRead(future, replyType, DEFAULT_TIMEOUT_IN_SECONDS);
+ return getReplyForRead(future, replyType, JvppReplyTimeoutHolder.getTimeout());
}
default <REP extends JVppReply<?>> REP getReplyForRead(@Nonnull Future<REP> future,
@@ -174,7 +177,7 @@ public interface JvppReplyConsumer {
default <REP extends JVppReply<?>> REP getReply(@Nonnull Future<REP> future)
throws TimeoutException, VppBaseCallException {
- return getReply(future, DEFAULT_TIMEOUT_IN_SECONDS);
+ return getReply(future, JvppReplyTimeoutHolder.getTimeout());
}
default <REP extends JVppReply<?>> REP getReply(@Nonnull Future<REP> future,
@@ -195,4 +198,26 @@ public interface JvppReplyConsumer {
throw new IllegalStateException(e);
}
}
+
+ /**
+ * Wrapper for reply timeout
+ */
+ class JvppReplyTimeoutHolder {
+ private static final Logger LOG = LoggerFactory.getLogger(JvppReplyTimeoutHolder.class);
+ private static Optional<Integer> timeout = Optional.empty();
+
+ public static void setupTimeout(@Nonnegative final int jvppTimeout) {
+ if (timeout.isPresent()) {
+ // do not fail on reconfigure, to not disturb restarts
+ LOG.warn("JVpp timeout already configured");
+ return;
+ }
+ timeout = Optional.of(jvppTimeout);
+ LOG.info("Jvpp reply timeout configured to {} seconds", timeout.get());
+ }
+
+ public static int getTimeout() {
+ return timeout.orElse(5);
+ }
+ }
}