From 9bc447077bce642c25faed9306537b4f1bf57230 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 1 Apr 2022 13:17:55 +0530 Subject: [PATCH] Enable dstat and memory_tracker in functional/fullstack jobs This Will help in troubleshooting failures related to high memory or cpu usage. Related-Bug: #1966394 Change-Id: I74b0d53bfc54b71d3e8b2d46739a944e5f5a6b6f --- roles/configure_functional_tests/tasks/main.yaml | 1 + tools/configure_for_func_testing.sh | 15 +++++++++++++++ zuul.d/base.yaml | 1 + 3 files changed, 17 insertions(+) diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml index 11debfb7736..fe629620fb9 100644 --- a/roles/configure_functional_tests/tasks/main.yaml +++ b/roles/configure_functional_tests/tasks/main.yaml @@ -16,6 +16,7 @@ OVS_BRANCH={{ OVS_BRANCH }} OVN_BRANCH={{ OVN_BRANCH }} Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }} + MEMORY_TRACKER={{ MEMORY_TRACKER }} INSTALL_OVN={{ INSTALL_OVN }} # This is DB USER used in e.g. pgsql db DATABASE_USER=openstack_citest diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 25205d982fc..29d514359a9 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -23,6 +23,7 @@ USE_CONSTRAINT_ENV=${USE_CONSTRAINT_ENV:-True} MYSQL_USER=${MYSQL_USER:-root} DATABASE_USER=${DATABASE_USER:-openstack_citest} DATABASE_NAME=${DATABASE_NAME:-openstack_citest} +MEMORY_TRACKER=${MEMORY_TRACKER:-False} if [[ "$IS_GATE" != "True" ]] && [[ "$#" -lt 1 ]]; then @@ -279,6 +280,20 @@ function _install_post_devstack { fi enable_kernel_bridge_firewall + + # install/start memory tracker service if enabled + if [[ "$MEMORY_TRACKER" == "True" ]]; then + # is_service_enabled checks for service into ENABLED_SERVICES + ENABLED_SERVICES+=,dstat,memory_tracker + source $DEVSTACK_PATH/lib/dstat + if is_ubuntu; then + install_package pcp + else + install_package pcp-system-tools + fi + install_dstat + start_dstat + fi } diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index d75011069fc..52733091821 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -36,6 +36,7 @@ vars: configure_swap_size: 8192 Q_BUILD_OVS_FROM_GIT: True + MEMORY_TRACKER: True INSTALL_OVN: True OVN_BRANCH: v21.06.0 OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"