aboutsummaryrefslogtreecommitdiffstats
path: root/vnfs/vFW
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2019-05-15 12:50:20 -0400
committerMarco Platania <platania@research.att.com>2019-05-15 12:50:20 -0400
commit6e8ffeb634053f128b8300e4b4d7b328474bbac5 (patch)
treec2e6442fc4906d9bca6610054b1154e23aeda5c5 /vnfs/vFW
parent51ec05ef1cc3f06c7808fa6b38793c989d5c1f81 (diff)
Fix honeycomb workaround
Change-Id: If59c6022a945e0ce9bc8fe1cfc8229cf0d963cc3 Issue-ID: INT-856 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'vnfs/vFW')
-rwxr-xr-xvnfs/vFW/scripts/v_packetgen_install.sh6
-rwxr-xr-xvnfs/vFW/scripts/v_packetgen_install_arm64.sh6
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