openstack/rally
Code Issues Proposed changes

[cli] Use json.loads instead of yaml while importing results

Browse Source 
Rally Task results are json file, there are no reasons to use yaml
deserializer for importing result. Even more, usage of yaml
deserializer affects the performance of import operation.

Change-Id: I965e0608ed8667e4a43de3323a63a948dab29bd6
This commit is contained in:
Andrey Kurilin 2018-04-06 14:46:27 +03:00
parent 29c4ea0989
commit 85ab3f9cae
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/cli/commands/task.py
View File

@ -667,7 +667,7 @@ class TaskCommands(object):
"""Load the json file which is created by `rally task results`"""
with open(os.path.expanduser(task_id)) as inp_js:
tasks_results = yaml.safe_load(inp_js)
tasks_results = json.loads(inp_js.read())
if isinstance(tasks_results, list):
# it is an old format:

3
rally/common/objects/task.py
View File

@ -16,6 +16,7 @@
import collections
import copy
import datetime as dt
import six
import uuid
from rally.common import db
@ -446,7 +447,7 @@ class Task(object):
actions_list.extend(action["children"])
for e in result["error"]:
if not isinstance(e, str):
if not isinstance(e, (six.string_types, six.text_type)):
LOG.warning("error value has wrong type '%s', should be 'str'"
% type(e))
return False

22
tests/unit/cli/commands/test_task.py
View File

@ -1076,10 +1076,10 @@ class TaskCommandsTestCase(test.TestCase):
], any_order=False)
@mock.patch("rally.cli.commands.task.open", create=True)
@mock.patch("rally.cli.commands.task.yaml.safe_load")
@mock.patch("rally.cli.commands.task.json.loads")
@mock.patch("rally.cli.commands.task.jsonschema.validate",
return_value=None)
def test__load_task_results_file(self, mock_validate, mock_safe_load,
def test__load_task_results_file(self, mock_validate, mock_loads,
mock_open):
task_file = "/tmp/task.json"
workload = {
@ -1142,7 +1142,7 @@ class TaskCommandsTestCase(test.TestCase):
"load_duration": workload["load_duration"],
"created_at": "2017-01-07T07:03:01"}
]
mock_safe_load.return_value = results
mock_loads.return_value = results
ret = self.task._load_task_results_file(self.fake_api, task_file)
self.assertEqual([{
"version": 2,
@ -1156,10 +1156,10 @@ class TaskCommandsTestCase(test.TestCase):
"workloads": [workload]}]}], ret)
@mock.patch("rally.cli.commands.task.open", create=True)
@mock.patch("rally.cli.commands.task.yaml.safe_load")
@mock.patch("rally.cli.commands.task.json.loads")
@mock.patch("rally.cli.commands.task.jsonschema.validate")
def test__load_task_new_results_file(self, mock_validate,
mock_safe_load, mock_open):
mock_loads, mock_open):
task_file = "/tmp/task.json"
results = {
"tasks": [{
@ -1176,7 +1176,7 @@ class TaskCommandsTestCase(test.TestCase):
}]
}
mock_safe_load.return_value = results
mock_loads.return_value = results
ret = self.task._load_task_results_file(self.fake_api, task_file)
self.assertEqual([{
"subtasks": [{
@ -1195,17 +1195,15 @@ class TaskCommandsTestCase(test.TestCase):
}], ret)
@mock.patch("rally.cli.commands.task.open", create=True)
@mock.patch("rally.cli.commands.task.yaml.safe_load")
def test__load_task_results_file_wrong_format(self,
mock_safe_load,
mock_open):
@mock.patch("rally.cli.commands.task.json.loads")
def test__load_task_results_file_wrong_format(self, mock_loads, mock_open):
task_id = "/tmp/task.json"
mock_safe_load.return_value = "results"
mock_loads.return_value = "results"
self.assertRaises(task.FailedToLoadResults,
self.task._load_task_results_file,
api=self.real_api, task_id=task_id)
mock_safe_load.return_value = ["results"]
mock_loads.return_value = ["results"]
self.assertRaises(task.FailedToLoadResults,
self.task._load_task_results_file,
api=self.real_api, task_id=task_id)