summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/userguide/test-usage.rst4
-rw-r--r--rest_server.py4
-rw-r--r--storperf/storperf_master.py16
-rw-r--r--storperf/test_executor.py8
4 files changed, 0 insertions, 32 deletions
diff --git a/docs/release/userguide/test-usage.rst b/docs/release/userguide/test-usage.rst
index 339fb28..2beae69 100644
--- a/docs/release/userguide/test-usage.rst
+++ b/docs/release/userguide/test-usage.rst
@@ -78,8 +78,6 @@ takes a JSON payload as follows.
.. code-block:: json
{
- "nowarm": "false",
- "nossd": "false",
"workload": "_warm_up"
}
@@ -137,8 +135,6 @@ remaining workloads will continue to execute in order.
{
"block_sizes": "2048,16384,
- "nowarm": "false",
- "nossd": "false",
"deadline": 20,
"queue_depths": "2,4",
"workload": "wr,rr,rw",
diff --git a/rest_server.py b/rest_server.py
index 20c1783..574fc32 100644
--- a/rest_server.py
+++ b/rest_server.py
@@ -336,10 +336,6 @@ prior to running any further tests,
storperf.filename = request.json['target']
if ('deadline' in request.json):
storperf.deadline = request.json['deadline']
- if ('nossd' in request.json):
- storperf.precondition = False
- if ('nowarm' in request.json):
- storperf.warm_up = False
if ('queue_depths' in request.json):
storperf.queue_depths = request.json['queue_depths']
if ('block_sizes' in request.json):
diff --git a/storperf/storperf_master.py b/storperf/storperf_master.py
index d0e0dc1..7acc510 100644
--- a/storperf/storperf_master.py
+++ b/storperf/storperf_master.py
@@ -167,14 +167,6 @@ class StorPerfMaster(object):
self._test_executor.filename = value
@property
- def precondition(self):
- return self._test_executor.precondition
-
- @precondition.setter
- def precondition(self, value):
- self._test_executor.precondition = value
-
- @property
def deadline(self):
return self._test_executor.deadline
@@ -183,14 +175,6 @@ class StorPerfMaster(object):
self._test_executor.deadline = value
@property
- def warm_up(self):
- return self._test_executor.warm
-
- @warm_up.setter
- def warm_up(self, value):
- self._test_executor.warm = value
-
- @property
def queue_depths(self):
return self._test_executor.queue_depths
diff --git a/storperf/test_executor.py b/storperf/test_executor.py
index 6b6316c..2fadc81 100644
--- a/storperf/test_executor.py
+++ b/storperf/test_executor.py
@@ -36,9 +36,7 @@ class TestExecutor(object):
self.logger = logging.getLogger(__name__)
self.workload_modules = []
self.filename = None
- self.precondition = True
self.deadline = None
- self.warm = True
self.metadata = {}
self.start_time = None
self.end_time = None
@@ -134,12 +132,6 @@ class TestExecutor(object):
else:
workloads = workloads.split(',')
- if (self.warm is True):
- workloads.insert(0, "_warm_up")
-
- if (self.precondition is True):
- workloads.insert(0, "_ssd_preconditioning")
-
for workload in workloads:
try:
workload_module = self.load_from_file("workloads/" +