Merge pull request #734 from fomars/master

hotfix hanging telegraf
yandex · Apr 10, 2019 · 4afbc9f · 4afbc9f
2 parents 726dc11 + bfdc61a
commit 4afbc9f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='yandextank',
-    version='1.12.0',
+    version='1.12.1',
     description='a performance measurement tool',
     longer_description='''
 Yandex.Tank is a performance measurement and load testing automatization tool.

diff --git a/yandextank/plugins/Telegraf/client.py b/yandextank/plugins/Telegraf/client.py
@@ -356,23 +356,22 @@ def uninstall(self):
                 'Unable to correctly stop monitoring agent - session is broken. Pay attention to agent log (%s).',
                 log_filename,
                 exc_info=True)
-        try:
-            self.ssh.get_file(
-                os.path.join(
-                    self.path['AGENT_REMOTE_FOLDER'],
-                    "_agent.log"),
-                log_filename)
-            self.ssh.get_file(
-                os.path.join(
-                    self.path['AGENT_REMOTE_FOLDER'],
-                    "monitoring.rawdata"),
-                data_filename)
-            self.ssh.rm_r(self.path['AGENT_REMOTE_FOLDER'])
-        except Exception:
-            logger.error("Unable to get agent artefacts", exc_info=True)
-
+        else:
+            try:
+                self.ssh.get_file(
+                    os.path.join(
+                        self.path['AGENT_REMOTE_FOLDER'],
+                        "_agent.log"),
+                    log_filename)
+                self.ssh.get_file(
+                    os.path.join(
+                        self.path['AGENT_REMOTE_FOLDER'],
+                        "monitoring.rawdata"),
+                    data_filename)
+                self.ssh.rm_r(self.path['AGENT_REMOTE_FOLDER'])
+            except Exception:
+                logger.error("Unable to get agent artefacts", exc_info=True)
         self._kill_agent()
-
         return log_filename, data_filename
 
     def _kill_agent(self):