Merge pull request #688 from yandex/master

up to Master
yandex · Dec 6, 2018 · f0e72f9 · f0e72f9
2 parents 4b6aea9 + f39a2d0
commit f0e72f9
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/yandextank/plugins/DataUploader/client.py b/yandextank/plugins/DataUploader/client.py
@@ -206,14 +206,17 @@ def __make_api_request(
                 else:
                     break
             except self.UnderMaintenance as e:
-                try:
-                    timeout = next(maintenance_timeouts)
-                    logger.warn(maintenance_msg)
-                    logger.warn("Retrying in %ss..." % timeout)
-                    time.sleep(timeout)
-                    continue
-                except StopIteration:
-                    raise e
+                if not self.core_interrupted.is_set():
+                    try:
+                        timeout = next(maintenance_timeouts)
+                        logger.warn(maintenance_msg)
+                        logger.warn("Retrying in %ss..." % timeout)
+                        time.sleep(timeout)
+                        continue
+                    except StopIteration:
+                        raise e
+                else:
+                    break
 
     def __make_writer_request(
             self,