From 4be5c0d17e0b7e253d01a770129e7477afe81525 Mon Sep 17 00:00:00 2001 From: Petr Benas Date: Mon, 25 Apr 2016 12:39:30 +0200 Subject: [PATCH] BUGFIX: check plugin still alive When starting a new run of a plugin and there's still previous instance stored, check whether it's still alive. It could have been killed by OOM killer. --- setup.py | 2 +- smoker.spec | 2 +- smoker/server/plugins/__init__.py | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a59793c..e3e60bc 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ # Parameters for build params = { 'name': name, - 'version': '2.1.3', + 'version': '2.1.4', 'packages': [ 'smoker', 'smoker.server', diff --git a/smoker.spec b/smoker.spec index ea75bd5..b152dd0 100644 --- a/smoker.spec +++ b/smoker.spec @@ -1,7 +1,7 @@ %global with_check 0 Name: smoker -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} Epoch: 1 Summary: Smoke Testing Framework diff --git a/smoker/server/plugins/__init__.py b/smoker/server/plugins/__init__.py index 7f8b101..06bfd51 100644 --- a/smoker/server/plugins/__init__.py +++ b/smoker/server/plugins/__init__.py @@ -376,7 +376,10 @@ def run(self): Check if plugin should be run and execute it """ if self.current_run: # already running - return + if self.current_run.is_alive(): + return + self.current_run.join() + # Plugin run when forced if self.forced: self.current_run = PluginWorker(self.name, self.queue, self.params,