From: Mark Beierl <mark.beierl@dell.com>
Date: Tue, 10 Jul 2018 13:46:26 +0000 (+0000)
Subject: Merge "Support Custom Workloads"
X-Git-Tag: opnfv-7.0.stable.RC1~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5d542e4d0e5a863adb9e0f484b8c14fb86d9d6c8;p=storperf.git

Merge "Support Custom Workloads"
---

5d542e4d0e5a863adb9e0f484b8c14fb86d9d6c8
diff --cc docker/storperf-master/storperf/storperf_master.py
index 7a94af8,1025789..4cd7071
--- a/docker/storperf-master/storperf/storperf_master.py
+++ b/docker/storperf-master/storperf/storperf_master.py
@@@ -355,15 -373,20 +373,25 @@@ class StorPerfMaster(object)
          stack_id = None
          if (self.stack_id is not None):
              stack_id = self.stack_id
 -            self.heat_stack.clean()
 +            try:
 +                self.heat_stack.clean()
 +            except Exception as e:
 +                self.logger.error("Stack creation failed")
 +                raise Exception(e)
 +            self.stack_id = None
          return stack_id
  
+     def executor_event(self, executor):
+         if executor.terminated:
+             self._test_executor = None
+ 
      def execute_workloads(self, metadata={}):
+         if (self._test_executor is not None and
+                 (not self._test_executor.terminated and
+                  self._test_executor.job_id is not None)):
+             raise Exception("ERROR: Job {} is already running".format(
+                 self._test_executor.job_id))
+ 
          if (self.stack_id is None):
              raise ParameterError("ERROR: Stack does not exist")