diff options
| author |   Marco Platania <platania@research.att.com> | 2019-05-15 12:50:20 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2019-05-15 16:51:35 +0000 |
| commit | 5252fede83b360c2c60d3bf28eecdd9db5c5b07b (patch) | |
| tree | f28395419ef85da5299bdfa52f0738484c68a70f | |
| parent | a5514f2351bacc868faabfde80fcf766d3073979 (diff) | |
Fix honeycomb workaround
Change-Id: If59c6022a945e0ce9bc8fe1cfc8229cf0d963cc3
Issue-ID: INT-856
Signed-off-by: Marco Platania <platania@research.att.com>
| -rwxr-xr-x | vnfs/vFW/scripts/v_packetgen_install.sh | 6 | ||||
| -rwxr-xr-x | vnfs/vFW/scripts/v_packetgen_install_arm64.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh index 48d7c291..15732a1a 100755 --- a/vnfs/vFW/scripts/v_packetgen_install.sh +++ b/vnfs/vFW/scripts/v_packetgen_install.sh @@ -85,17 +85,17 @@ apt-get update apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev sleep 1 -# Install honeycomb restart script (workaround due to honeycomb file handle leak - check every 5 minutes if honeycomb is up) +# Install honeycomb restart script (workaround due to honeycomb shutdown: check every 5 minutes if it's still up) cat > /opt/start_honeycomb.sh <<EOF #!/bin/bash -PID=$(ps -u root | grep honeycomb | awk '{printf $1}') +PID=$(ps -u root | grep java | awk '{printf $1}') if [[ -z $PID ]]; then VERSION=$(cat /opt/config/demo_artifacts_version.txt) bash /opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown fi EOF chmod +x /opt/start_honeycomb.sh -(crontab -l 2>/dev/null; echo "*/5 * * * * /opt/start_honeycomb.sh") | crontab - +(crontab -l 2>/dev/null; echo "*/5 * * * * bash /opt/start_honeycomb.sh") | crontab - # Run instantiation script cd /opt diff --git a/vnfs/vFW/scripts/v_packetgen_install_arm64.sh b/vnfs/vFW/scripts/v_packetgen_install_arm64.sh index 773baa17..00e23f53 100755 --- a/vnfs/vFW/scripts/v_packetgen_install_arm64.sh +++ b/vnfs/vFW/scripts/v_packetgen_install_arm64.sh @@ -85,17 +85,17 @@ apt-get update apt-get -o Dpkg::Options::="--force-overwrite" install -y vpp vpp-lib vpp-dbg vpp-plugins vpp-dev dpdk dpdk-dev dpdk-igb-uio-dkms dpdk-rte-kni-dkms honeycomb sleep 1 -# Install honeycomb restart script (workaround due to honeycomb file handle leak - check every 5 minutes if honeycomb is up) +# Install honeycomb restart script (workaround due to honeycomb shutdown: check every 5 minutes if it's still up) cat > /opt/start_honeycomb.sh <<EOF #!/bin/bash -PID=$(ps -u root | grep honeycomb | awk '{printf $1}') +PID=$(ps -u root | grep java | awk '{printf $1}') if [[ -z $PID ]]; then VERSION=$(cat /opt/config/demo_artifacts_version.txt) bash /opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown fi EOF chmod +x /opt/start_honeycomb.sh -(crontab -l 2>/dev/null; echo "*/5 * * * * /opt/start_honeycomb.sh") | crontab - +(crontab -l 2>/dev/null; echo "*/5 * * * * bash /opt/start_honeycomb.sh") | crontab - # Run instantiation script cd /opt |