Increase timeout on vagrant tests

https://pulp.plan.io/issues/8498 closes #8498
pulp · Apr 1, 2021 · 318c9ae · 318c9ae
1 parent e8f8fea
commit 318c9ae
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -64,6 +64,8 @@ if /bin/false ; then
   sudo vagrant plugin install vagrant-sshfs
 fi
 
+sed -i "s/pulp_service_timeout: 90/pulp_service_timeout: 180/g" roles/pulp_common/defaults/main.yml
+
 if sudo kvm-ok ; then
   # Speed up disk writes by switching qemu-kvm from writeback to unsafe.
   ln -s $PWD/vagrant/settings.ci.yaml forklift/vagrant/settings.yaml

diff --git a/CHANGES/8498.feature b/CHANGES/8498.feature
@@ -0,0 +1 @@
+Introduce advanced variable: ``pulp_service_timeout``
diff --git a/example.dev-config.yml b/example.dev-config.yml
@@ -2,8 +2,6 @@
 # Options
 pulp_devel_supplement_bashrc: true
 pulp_default_admin_password: password
-pulp_api_bind: "unix:/var/run/pulpcore-api/pulpcore-api.sock"
-pulp_content_bind: "unix:/var/run/pulpcore-content/pulpcore-content.sock"
 pulp_install_plugins:
   # galaxy-ng:
   #   source_dir: "/home/vagrant/devel/galaxy_ng"

diff --git a/roles/pulp_api/templates/pulpcore-api.service.j2 b/roles/pulp_api/templates/pulpcore-api.service.j2
@@ -15,12 +15,12 @@ Group={{ pulp_group }}
 PIDFile=/run/pulpcore-api.pid
 RuntimeDirectory=pulpcore-api
 
-# timeout 90 is needed Pulp to service its 1st request on extremely slow
+# timeout is needed Pulp to service its 1st request on extremely slow
 # machines, such as qemu-emulated 2-core machines
 ExecStart={{ __pulp_daemons_dir }}/gunicorn pulpcore.app.wsgi:application \
           --bind '{{ pulp_api_bind }}' \
           --workers {{ pulp_api_workers }} \
-          --timeout 90 \
+          --timeout {{ pulp_service_timeout }} \
           --access-logfile - \
           --access-logformat 'pulp [%({correlation-id}o)s]: %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
 

diff --git a/roles/pulp_common/README.md b/roles/pulp_common/README.md
@@ -161,6 +161,7 @@ Role Variables for advanced usage
 * `pulpcore_version`: Specify a specific version of pulpcore one would like to install or upgrade to.
    By default the installer will do the right thing by using the version of pulpcore it is designed
    for and tested with. It is strongly advised against setting.
+* `pulp_service_timeout`: Set timeout value for pulp services. Defaults to 90.
 
 Shared Variables
 ----------------

diff --git a/roles/pulp_common/defaults/main.yml b/roles/pulp_common/defaults/main.yml
@@ -8,6 +8,7 @@ pulp_settings_file: '{{ pulp_config_dir }}/settings.py'
 pulp_install_source: pip
 pulp_install_dir: '{{ (pulp_install_source == "packages") | ternary("/usr", "/usr/local/lib/pulp") }}'
 __pulp_daemons_dir: '{{ (pulp_install_source == "packages") | ternary("/usr/libexec/pulpcore", pulp_install_dir ~ "/bin") }}'
+pulp_service_timeout: 90
 pulp_install_api_service: true
 # Deprecated unused. Variables for dependency upgrades are TBD
 pulp_upgrade: false

diff --git a/roles/pulp_content/templates/pulpcore-content.service.j2 b/roles/pulp_content/templates/pulpcore-content.service.j2
@@ -15,13 +15,13 @@ Group={{ pulp_group }}
 WorkingDirectory=/var/run/pulpcore-content/
 RuntimeDirectory=pulpcore-content
 
-# timeout 90 is needed Pulp to service its 1st request on extremely slow
+# timeout is needed Pulp to service its 1st request on extremely slow
 # machines, such as qemu-emulated 2-core machines
 ExecStart={{ __pulp_daemons_dir }}/gunicorn pulpcore.content:server \
           --bind '{{ pulp_content_bind }}' \
           --worker-class 'aiohttp.GunicornWebWorker' \
           --workers {{ pulp_content_workers }} \
-          --timeout 90 \
+          --timeout {{ pulp_service_timeout }} \
           --access-logfile -
 
 # Enables tracking of process resource consumption at a unit & cgroup level.