From 996a7df22ca8a42700e13047b3e89bbcb80ec54f Mon Sep 17 00:00:00 2001 From: Thobias Salazar Trevisan Date: Fri, 10 Jul 2020 15:10:56 -0300 Subject: [PATCH] Fix filedescriptor issue with VMTasks scenario. VMTasks does not close ssh when it runs commands over ssh. The number of file descriptors increase over time during execution. Change-Id: I039fb7f8e504619cb3c1a88716942b0f6a8c6e08 --- rally_openstack/task/scenarios/vm/utils.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rally_openstack/task/scenarios/vm/utils.py b/rally_openstack/task/scenarios/vm/utils.py index f9976f04..4958696b 100644 --- a/rally_openstack/task/scenarios/vm/utils.py +++ b/rally_openstack/task/scenarios/vm/utils.py @@ -223,5 +223,11 @@ class VMScenario(nova_utils.NovaScenario): pkey = pkey if pkey else self.context["user"]["keypair"]["private"] ssh = sshutils.SSH(username, server_ip, port=port, pkey=pkey, password=password) - self._wait_for_ssh(ssh, timeout, interval) - return self._run_command_over_ssh(ssh, command) + try: + self._wait_for_ssh(ssh, timeout, interval) + return self._run_command_over_ssh(ssh, command) + finally: + try: + ssh.close() + except AttributeError: + pass