Skip to content

Commit 1f95e02

Browse files
Updating redis to v4.2.2 (#343)
1 parent 7a71ffd commit 1f95e02

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

poetry.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.8.0"
3+
version = "0.8.1"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
66
readme = "README.md"
@@ -43,7 +43,7 @@ scipy = "^1.3.3"
4343
scikit-learn = "^0.22.2"
4444
Jinja2 = "^3.0.3"
4545
watchdog = "^2.1.6"
46-
redis = "4.2.0rc3"
46+
redis = "4.2.2"
4747

4848
[tool.poetry.dev-dependencies]
4949
pytest = "^4.6"

redisbench_admin/profilers/perf.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ def stop_profile(self, **kwargs):
202202
result = False
203203
self.profile_end_time = time.time()
204204
if not self._is_alive(self.profiler_process):
205-
self.logger.error(
206-
"Profiler process is not alive, might have crash during test execution. Exit code: {}".format(
205+
self.logger.warning(
206+
"Profiler process is not alive. might have crash during test execution. Exit code: {}".format(
207207
self.profiler_process_exit_code
208208
)
209209
)
@@ -288,8 +288,11 @@ def generate_trace_file_from_profile(self, filename=None):
288288
try:
289289
subprocess.Popen(args=args, stdout=outfile).wait()
290290
except OSError as e:
291+
args_str = " ".join([str(x) for x in args])
291292
self.logger.error(
292-
"Unable to run {} script {}".format(self.perf, e.__str__())
293+
"Unable to run {} script with args {}. Error: {}".format(
294+
self.perf, args_str, e.__str__()
295+
)
293296
)
294297
if self.pid is not None:
295298
filename_main_thread = filename + ".mainthread"
@@ -302,19 +305,20 @@ def generate_trace_file_from_profile(self, filename=None):
302305
"-i",
303306
self.output,
304307
]
308+
args_str = " ".join([str(x) for x in args])
305309
try:
306310
subprocess.Popen(args=args, stdout=outfile).wait()
307311
self.trace_file_main_thread = filename_main_thread
308312
except OSError as e:
309313
self.logger.error(
310-
"Unable to run {} script {}".format(
311-
self.perf, e.__str__()
314+
"Unable to run {} script args {}. Error: {}".format(
315+
self.perf, args_str, e.__str__()
312316
)
313317
)
314318
except Exception as e:
315319
self.logger.error(
316-
"Unable to run {} script {}".format(
317-
self.perf, e.__str__()
320+
"Unable to run {} script args {}. Error: {}".format(
321+
self.perf, args_str, e.__str__()
318322
)
319323
)
320324
else:

redisbench_admin/profilers/profilers_local.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,20 @@ def profilers_stop_if_required(
101101
",".join(tabular_data_map.keys()),
102102
)
103103
)
104-
overall_artifacts_map.update(profile_res_artifacts_map)
105-
overall_tabular_data_map.update(tabular_data_map)
104+
else:
105+
logging.error(
106+
"One or more steps within Profiler {} for pid {} exited with ERROR!".format(
107+
profiler_name,
108+
profiler_obj.pid,
109+
)
110+
)
111+
logging.info(
112+
"There are a total of {} artifacts".format(
113+
len(profile_res_artifacts_map.values())
114+
)
115+
)
116+
overall_artifacts_map.update(profile_res_artifacts_map)
117+
overall_tabular_data_map.update(tabular_data_map)
106118

107119
for (
108120
artifact_name,

0 commit comments

Comments
 (0)