From fab0a3de3e7659e91f3b26f205c79e590a1be227 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Wed, 20 Sep 2023 09:44:09 +0200 Subject: [PATCH 1/5] increase CI time to 'deploy' --- ci-scripts/cls_physim1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index b0c9012d7d..70f8729764 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -161,7 +161,7 @@ class PhySim: isRunning = False count = 0 # Check whether the containers are in Running state or not under 2 mins - while(count < 2 and isRunning == False): + while(count < 5 and isRunning == False): time.sleep(60) mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True) running_count = mySSH.getBefore().count('Running') From 91497ece942beecff7ddd44c89f895fd2b664535 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Fri, 25 Aug 2023 14:13:36 +0200 Subject: [PATCH 2/5] Reduce ITTI log verbosity Only print messages when queue grows by 10%, and add log if message queue size shrinks --- common/utils/ocp_itti/intertask_interface.cpp | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp index b0d05c6aca..a68ed93cab 100644 --- a/common/utils/ocp_itti/intertask_interface.cpp +++ b/common/utils/ocp_itti/intertask_interface.cpp @@ -49,6 +49,7 @@ extern "C" { int nb_fd_epoll=0; int epoll_fd=-1; int sem_fd=-1; + size_t last_log_size = 0; } task_list_t; int timer_expired(int fd); @@ -131,11 +132,26 @@ extern "C" { int message_id = message->ittiMsgHeader.messageId; size_t s=t->message_queue.size(); - if ( s > t->admin.queue_size ) - LOG_E(TMR,"Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s ); + if (s > t->last_log_size * 1.1) { + // to reduce the number of logs, we give a message each increase of 10% + if (s > t->admin.queue_size) + LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s); - if ( s > 50 ) - LOG_I(ITTI,"Queue for %s task size: %ld (last message %s)\n",itti_get_task_name(destination_task_id), s+1,ITTI_MSG_NAME(message)); + if (s > t->admin.queue_size / 10) + LOG_I(ITTI, + "Queue for %s task size: %ld (last message %s)\n", + itti_get_task_name(destination_task_id), + s + 1, + ITTI_MSG_NAME(message)); + + t->last_log_size = s; + } + + if (t->last_log_size && t->last_log_size < t->admin.queue_size / 10) { + // Inform when the queue decreases + LOG_I(ITTI, "Queue for %s task size is back under 10%% of max size\n", itti_get_task_name(destination_task_id)); + t->last_log_size = 0; + } t->message_queue.insert(t->message_queue.begin(), message); eventfd_t sem_counter = 1; From d19302fb40fe3be22e574748b9acf50b9e6d2013 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Mon, 25 Sep 2023 15:21:21 +0200 Subject: [PATCH 3/5] revert last change --- common/utils/ocp_itti/intertask_interface.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp index a68ed93cab..f6cd1f71ca 100644 --- a/common/utils/ocp_itti/intertask_interface.cpp +++ b/common/utils/ocp_itti/intertask_interface.cpp @@ -132,17 +132,17 @@ extern "C" { int message_id = message->ittiMsgHeader.messageId; size_t s=t->message_queue.size(); - if (s > t->last_log_size * 1.1) { // to reduce the number of logs, we give a message each increase of 10% - if (s > t->admin.queue_size) - LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s); + if (s > t->last_log_size * 1.1 && s > t->admin.queue_size) { + LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s); + t->last_log_size = s; - if (s > t->admin.queue_size / 10) - LOG_I(ITTI, - "Queue for %s task size: %ld (last message %s)\n", - itti_get_task_name(destination_task_id), - s + 1, - ITTI_MSG_NAME(message)); + } else if (s > t->last_log_size * 1.1 && s > t->admin.queue_size / 10) { + LOG_I(ITTI, + "Queue for %s task size: %ld (last message %s)\n", + itti_get_task_name(destination_task_id), + s + 1, + ITTI_MSG_NAME(message)); t->last_log_size = s; } From cf36c6d893cde76dd2533bc050a805a8bd11b331 Mon Sep 17 00:00:00 2001 From: luis_pereira87 Date: Wed, 27 Sep 2023 15:59:08 +0100 Subject: [PATCH 4/5] Improvements to reduce ITTI log message volume when queues full --- common/utils/ocp_itti/intertask_interface.cpp | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp index f6cd1f71ca..11a18794e6 100644 --- a/common/utils/ocp_itti/intertask_interface.cpp +++ b/common/utils/ocp_itti/intertask_interface.cpp @@ -132,22 +132,19 @@ extern "C" { int message_id = message->ittiMsgHeader.messageId; size_t s=t->message_queue.size(); - // to reduce the number of logs, we give a message each increase of 10% - if (s > t->last_log_size * 1.1 && s > t->admin.queue_size) { - LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s); + // to reduce the number of logs, we give a message each increase of 10% + if ((s > t->last_log_size * 1.25) && (s > t->admin.queue_size / 10)) { + if (s > t->admin.queue_size) { + LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s); + } else { + LOG_I(ITTI, + "Queue for %s task size: %ld (last message %s)\n", + itti_get_task_name(destination_task_id), + s + 1, + ITTI_MSG_NAME(message)); + } t->last_log_size = s; - - } else if (s > t->last_log_size * 1.1 && s > t->admin.queue_size / 10) { - LOG_I(ITTI, - "Queue for %s task size: %ld (last message %s)\n", - itti_get_task_name(destination_task_id), - s + 1, - ITTI_MSG_NAME(message)); - - t->last_log_size = s; - } - - if (t->last_log_size && t->last_log_size < t->admin.queue_size / 10) { + } else if (t->last_log_size && s < t->admin.queue_size / 10) { // Inform when the queue decreases LOG_I(ITTI, "Queue for %s task size is back under 10%% of max size\n", itti_get_task_name(destination_task_id)); t->last_log_size = 0; From dbdfe06d1e9434af687be0583ef178c3c9ba9813 Mon Sep 17 00:00:00 2001 From: luis_pereira87 Date: Wed, 27 Sep 2023 16:01:26 +0100 Subject: [PATCH 5/5] Fix comment from 10% to 25% --- common/utils/ocp_itti/intertask_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp index 11a18794e6..941e4de6ef 100644 --- a/common/utils/ocp_itti/intertask_interface.cpp +++ b/common/utils/ocp_itti/intertask_interface.cpp @@ -132,7 +132,7 @@ extern "C" { int message_id = message->ittiMsgHeader.messageId; size_t s=t->message_queue.size(); - // to reduce the number of logs, we give a message each increase of 10% + // to reduce the number of logs, we give a message each increase of 25% if ((s > t->last_log_size * 1.25) && (s > t->admin.queue_size / 10)) { if (s > t->admin.queue_size) { LOG_E(TMR, "Queue for %s task contains %ld messages\n", itti_get_task_name(destination_task_id), s);