From f430187b110255f9a09be037dc8d908f8b9428ce Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Tue, 8 Sep 2015 18:00:17 +0100 Subject: [PATCH] sysbench: fixed case where default timeout < max_time --- wlauto/workloads/sysbench/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wlauto/workloads/sysbench/__init__.py b/wlauto/workloads/sysbench/__init__.py index d52ee243..a241f1b5 100644 --- a/wlauto/workloads/sysbench/__init__.py +++ b/wlauto/workloads/sysbench/__init__.py @@ -85,6 +85,8 @@ class Sysbench(Workload): self.num_threads = self.threads if (self.max_requests is None) and (self.max_time is None): self.max_time = 30 + if self.max_time and (self.max_time + 10) > self.timeout: + self.timeout = self.max_time + 10 if self.test == 'fileio' and not self.file_test_mode: self.logger.debug('Test is "fileio" and no file_test_mode specified -- using default.') self.file_test_mode = 'seqwr'