diff options
| -rwxr-xr-x | ci/daily.sh | 4 | ||||
| -rw-r--r-- | docker/storperf-master/rest_server.py | 2 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/storperf_master.py | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ci/daily.sh b/ci/daily.sh index 4711475..17026f3 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -89,14 +89,14 @@ JOB=$("${WORKSPACE}/ci/start_job.sh" \ curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ -o "${WORKSPACE}/ci/job/status.json" -JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2) +JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2) while [ "${JOB_STATUS}" != "Completed" ] do sleep 600 mv "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json" curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ -o "${WORKSPACE}/ci/job/status.json" - JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2) + JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2) if diff "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json" >/dev/null then cat "${WORKSPACE}/ci/job/status.json" diff --git a/docker/storperf-master/rest_server.py b/docker/storperf-master/rest_server.py index ce3a41c..547a0fd 100644 --- a/docker/storperf-master/rest_server.py +++ b/docker/storperf-master/rest_server.py @@ -10,7 +10,6 @@ import json import logging.config import os -import sys from flask import abort, Flask, request, jsonify from flask_cors import CORS @@ -424,7 +423,6 @@ the last stack named. ] ) def delete(self): - self.logger.info("Threads: %s" % sys._current_frames()) try: return jsonify({'Slaves': storperf.terminate_workloads()}) except Exception as e: diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index 76c4807..3de8478 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -62,8 +62,6 @@ class StorPerfMaster(object): self.heat_stack = OpenStackHeatStack(self.os_creds, self.stack_settings) - self._cached_stack_id = None - self._last_snaps_check_time = None self._snaps_pool = worker_pool(20) def reset_values(self): @@ -93,6 +91,8 @@ class StorPerfMaster(object): self.stackless = False self.mkfs = None self.mount_device = None + self._last_snaps_check_time = None + self._cached_stack_id = None @property def volume_count(self): |