From 90f221c5172bfd8195c9dd48cf2935b780b30c43 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Wed, 13 Jan 2016 12:36:53 -0800 Subject: [PATCH] dump first and last 500K bytes of karaf.log instead of last 1M Change-Id: I67898e149d9430b6ae99d0a44dc5d5fd781cc62a Signed-off-by: Jamo Luhrsen --- ...w-integration-deploy-controller-offline.sh | 7 +++++-- ...-integration-deploy-controller-run-test.sh | 12 ++++++++---- ...aw-integration-deploy-controller-verify.sh | 12 ++++++++---- ...-raw-integration-start-cluster-run-test.sh | 19 +++++++++++++------ 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh index 97c4f548a9..c91f3f301c 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh @@ -48,9 +48,12 @@ sleep 10 echo "Installing all features..." sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt -echo "Killing ODL and fetching Karaf log..." -tail --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" +echo "dumping first 500K bytes of karaf log..." +head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" +echo "dumping last 500K bytes of karaf log..." +tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" # TODO: Do we want different name for karaf.log chunk to signal it may be not complete? +echo "killing karaf process..." ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh sleep 5 xz -9ekvv "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh index 7f0faa4534..536458cf7a 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh @@ -88,8 +88,10 @@ while true; do break elif (( "\$COUNT" > "600" )); then echo Timeout Controller DOWN - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" echo "Listing all open ports on controller system" netstat -natu exit 1 @@ -110,8 +112,10 @@ function exit_on_log_file_message { echo "looking for \"\$1\" in log file" if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then echo ABORTING: found "\$1" - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" exit 1 fi } diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh index de1aee3643..d7b57d004a 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh @@ -76,8 +76,10 @@ function exit_on_log_file_message { echo "looking for \"$1\" in karaf.log file" if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then echo ABORTING: found "$1" - echo "Dumping first 1M of karaf.log..." - tail --bytes=1M ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log . cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log . exit 1 @@ -86,8 +88,10 @@ function exit_on_log_file_message { echo "looking for \"$1\" in karaf_console.log file" if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then echo ABORTING: found "$1" - echo "Dumping first 1M of karaf_console.log..." - tail --bytes=1M ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log . cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log . exit 1 diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh index 154d1261fd..d6d1bfb04c 100644 --- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh +++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh @@ -25,8 +25,10 @@ while true; do break elif (( "\$COUNT" > "600" )); then echo Timeout Controller DOWN - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" echo "Listing all open ports on controller system" netstat -natu exit 1 @@ -44,8 +46,10 @@ function exit_on_log_file_message { echo "looking for \"\$1\" in log file" if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then echo ABORTING: found "\$1" - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" exit 1 fi } @@ -94,12 +98,15 @@ TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_ -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \ -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true -echo "Killing ODL and fetching Karaf log..." set +e # We do not want to create red dot just because something went wrong while fetching logs. for i in `seq 1 ${NUM_ODL_SYSTEM}` do CONTROLLERIP=ODL_SYSTEM_${i}_IP - ssh "${!CONTROLLERIP}" tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log" + echo "dumping first 500K bytes of karaf log..." > "odl${i}_karaf.log" + ssh "${!CONTROLLERIP}" head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" + echo "dumping last 500K bytes of karaf log..." >> "odl${i}_karaf.log" + ssh "${!CONTROLLERIP}" tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" + echo "killing karaf process..." ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh' done sleep 5 -- 2.36.6