From 49a8666711f62edf78ed59272a7446899c397922 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 6 Sep 2016 12:03:32 +0200 Subject: HONEYCOMB-78: enable HC restart Includes: - restart script for honeycomb - HONEYCOMBC-78 fix: jVPPRegistry.close() is not invoked in case of VPP restart. That prevents subsequent attempts to establish connection from failing (we cannot invoke vl_client_disconnect_from_vlib before connect_to_vpe on fresh vpp instance). Change-Id: Icf4d6a6a40605ed34d307a0f1405b8804ba5df53 Signed-off-by: Marek Gradzki --- .../translate/v3po/util/VppStatusListener.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/VppStatusListener.java (limited to 'vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/VppStatusListener.java') diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/VppStatusListener.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/VppStatusListener.java new file mode 100644 index 000000000..7a728280d --- /dev/null +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/VppStatusListener.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016 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.honeycomb.translate.v3po.util; + +import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Listens to vpp status changes. Restarts honeycomb if vpp is down. + */ +public final class VppStatusListener implements KeepaliveReaderWrapper.KeepaliveFailureListener { + + /** + * Value picked up by honeycomb start script, tigers honeycomb restart when returned by the java process + */ + public static final int RESTART_ERROR_CODE = 100; + private static final Logger LOG = LoggerFactory.getLogger(VppStatusListener.class); + + private volatile boolean down; + + public boolean isDown() { + return down; + } + + @Override + public void onKeepaliveFailure() { + LOG.error("Keepalive failed. VPP is probably DOWN! Restarting Honeycomb"); + this.down = true; + System.exit(RESTART_ERROR_CODE); + } +} -- cgit 1.2.3-korg