From c749d404c66d7a11031f489a430c664d808211fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Drago=C8=99-Iulian=20ARGINT?= <dragosargint21@gmail.com>
Date: Tue, 16 Apr 2024 23:36:01 +0300
Subject: [PATCH] Change the output of so2_cm_checker_logger.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: DragoČ-Iulian ARGINT <dragosargint21@gmail.com>
---
checker/checker.sh | 16 +++++++++++-----
checker/checker_daemons/so2_vm_checker_logger.sh | 4 +---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/checker/checker.sh b/checker/checker.sh
index dfab0ce..e461e54 100755
--- a/checker/checker.sh
+++ b/checker/checker.sh
@@ -84,18 +84,24 @@ recover_grade_from_timeout()
fi
}
-timeout_exceeded()
+dmesg_log_dump()
{
- local output=$1
- pkill -SIGKILL qemu
- echo ""
- echo "TIMEOUT EXCEEDED !!! killing the process"
if [[ $DMESG_LOG != "" ]]; then
echo "dumping DMESG_LOG=${DMESG_LOG} output"
echo ">>>>---------------DMESG_LOG_STARTS_HERE------------------<<<<<"
cat $DMESG_LOG
echo ">>>>----------------DMESG_LOG_ENDS_HERE-------------------<<<<<"
fi
+}
+
+timeout_exceeded()
+{
+ local output=$1
+ pkill -SIGKILL qemu
+ echo ""
+ echo "TIMEOUT EXCEEDED !!! killing the process"
+
+ dmesg_log_dump
if [[ $RECOVER_GRADE_TIMEOUT == 0 ]]; then
if [ -f $output ]; then
diff --git a/checker/checker_daemons/so2_vm_checker_logger.sh b/checker/checker_daemons/so2_vm_checker_logger.sh
index 5d70125..fe61fb6 100644
--- a/checker/checker_daemons/so2_vm_checker_logger.sh
+++ b/checker/checker_daemons/so2_vm_checker_logger.sh
@@ -11,9 +11,7 @@ start()
while true
do
sleep 1
- echo ------------------START_HERE------------------ >> $LOG_FILE
- dmesg >> $LOG_FILE
- echo -------------------END_HERE------------------- >> $LOG_FILE
+ dmesg -c >> $LOG_FILE
done
}
--
GitLab