--- /dev/null
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed 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 io.fd.hc2vpp.common.integration;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+
+class JVppTimeoutProvider implements Provider<JVppTimeoutProvider.JVppTimeoutInit> {
+
+ @Inject
+ private VppConfigAttributes configAttributes;
+
+ @Override
+ public JVppTimeoutInit get() {
+ JvppReplyConsumer.JvppReplyTimeoutHolder.setupTimeout(configAttributes.jvppRequestTimeout);
+ return new JVppTimeoutInit() {
+ };
+ }
+
+ interface JVppTimeoutInit {
+ }
+}
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.inject.name.Named;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
import io.fd.honeycomb.translate.read.ReaderFactory;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
initMocks(this);
Guice.createInjector(new VppCommonModule(), BoundFieldModule.of(this)).injectMembers(this);
assertThat(readerFactories, is(not(empty())));
+ assertEquals(15, JvppReplyConsumer.JvppReplyTimeoutHolder.getTimeout());
+ }
+
+ public void testConfigureJVppTimeoutIgnoreOnRetry() {
+ initMocks(this);
+ Guice.createInjector(new VppCommonModule(), BoundFieldModule.of(this)).injectMembers(this);
+ JvppReplyConsumer.JvppReplyTimeoutHolder.setupTimeout(1);
+ // reconfiguration is ignored
+ assertEquals(15, JvppReplyConsumer.JvppReplyTimeoutHolder.getTimeout());
}
}
\ No newline at end of file
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;
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() {
};
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());
}
/**
@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());
}
/**
@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());
}
/**
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());
}
/**
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,
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,
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);
+ }
+ }
}
Code Review / hc2vpp.git / commitdiff