From 6236d78a4a60eb5f56f218b1e6aa83bb307ba0c5 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 31 Oct 2019 11:42:47 +0000 Subject: [PATCH] Set rootwrap daemon timeout for fullstack and functional tests Set a big timeout for rootwrap daemon in functional and fullstack tests. The value defined in 7800, the same as the Zuul jobs timeout. This timeout increase will prevent the daemon to close when executing a test root command, as described in the bug. An unexpected rootwrap daemon closure is not considered as a normal event during the test execution. The default value set in the configuration file is 600 seconds, the same as daemon default value. This timeout is increased only when OS_SUDO_TESTING=1, that means functional and fullstack tests, when using the script "tools/deploy_rootwrap.sh". Change-Id: I691300a4e9a7cccd8887bc8f95ba9cea32988bac Closes-Bug: #1850558 (cherry picked from commit 721887305038fe4449083eb6c33f355232c73555) --- etc/rootwrap.conf | 3 +++ tools/deploy_rootwrap.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/etc/rootwrap.conf b/etc/rootwrap.conf index 3b56b6a3e49..9cd93527fdb 100644 --- a/etc/rootwrap.conf +++ b/etc/rootwrap.conf @@ -26,6 +26,9 @@ syslog_log_facility=syslog # ERROR means only log unsuccessful attempts syslog_log_level=ERROR +# Rootwrap daemon exits after this seconds of inactivity +daemon_timeout=600 + [xenapi] # XenAPI configuration is only required by the L2 agent if it is to # target a XenServer/XCP compute host's dom0. diff --git a/tools/deploy_rootwrap.sh b/tools/deploy_rootwrap.sh index ec392ae825b..9669a6981c3 100755 --- a/tools/deploy_rootwrap.sh +++ b/tools/deploy_rootwrap.sh @@ -55,6 +55,7 @@ sed -i "s:^exec_dirs=\(.*\)$:exec_dirs=${target_bin_path},${fullstack_path},\1:" if [[ "$OS_SUDO_TESTING" = "1" ]]; then sed -i 's/use_syslog=False/use_syslog=True/g' ${dst_conf} sed -i 's/syslog_log_level=ERROR/syslog_log_level=DEBUG/g' ${dst_conf} + sed -i 's/daemon_timeout=600/daemon_timeout=7800/g' ${dst_conf} cp -p ${neutron_path}/neutron/tests/contrib/testing.filters \ ${dst_rootwrap_path}/ fi