Merge pull request #508 from nettorta/develop

symlinks failover patch
yandex · Feb 12, 2018 · c68fe98 · c68fe98
2 parents 3e8189d + e1ba6b2
commit c68fe98
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/yandextank/plugins/DataUploader/cli.py b/yandextank/plugins/DataUploader/cli.py
@@ -115,8 +115,12 @@ def get_plugin_dir(shooting_dir):
 def make_symlink(shooting_dir, name):
     plugin_dir = get_plugin_dir(shooting_dir)
     link_name = os.path.join(plugin_dir, str(name))
-    os.symlink(os.path.relpath(shooting_dir, plugin_dir), link_name)
-    logger.info('Symlink created: {}'.format(os.path.abspath(link_name)))
+    try:
+        os.symlink(os.path.relpath(shooting_dir, plugin_dir), link_name)
+    except OSError:
+        logger.warning('Unable to create symlink for artifact: %s', link_name)
+    else:
+        logger.info('Symlink created: {}'.format(os.path.abspath(link_name)))
 
 
 class ConfigError(Exception):

diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py
@@ -494,13 +494,17 @@ def make_symlink(self, name):
         PLUGIN_DIR = os.path.join(self.core.artifacts_base_dir, 'lunapark')
         if not os.path.exists(PLUGIN_DIR):
             os.makedirs(PLUGIN_DIR)
-        os.symlink(
-            os.path.relpath(
-                self.core.artifacts_dir,
-                PLUGIN_DIR),
-            os.path.join(
-                PLUGIN_DIR,
-                str(name)))
+        try:
+            os.symlink(
+                os.path.relpath(
+                    self.core.artifacts_dir,
+                    PLUGIN_DIR),
+                os.path.join(
+                    PLUGIN_DIR,
+                    str(name)))
+        # this exception catch for filesystems w/o symlinks
+        except OSError:
+            logger.warning('Unable to create symlink for artifact: %s', name)
 
     def _get_user_agent(self):
         plugin_agent = 'Uploader/{}'.format(self.VERSION)

diff --git a/yandextank/plugins/Influx/plugin.py b/yandextank/plugins/Influx/plugin.py
@@ -5,11 +5,9 @@
 import logging
 import sys
 import datetime
-from uuid import uuid4
 
+from uuid import uuid4
 from builtins import str
-
-
 from influxdb import InfluxDBClient
 
 from ...common.interfaces import AbstractPlugin, \