Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "redisbench-admin"
version = "0.7.24"
version = "0.7.25"
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
readme = "README.md"
Expand Down
20 changes: 17 additions & 3 deletions redisbench_admin/compare/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#

# environment variables
import datetime

from redisbench_admin.run.args import TRIGGERING_ENV
from redisbench_admin.run.common import get_start_time_vars
from redisbench_admin.utils.remote import (
Expand All @@ -26,6 +28,8 @@

_, NOW_UTC, _ = get_start_time_vars()
LAST_WEEK_UTC = NOW_UTC - (7 * 24 * 60 * 60 * 1000)
START_TIME_NOW_UTC, _, _ = get_start_time_vars()
START_TIME_LAST_WEEK_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=7)


def create_compare_arguments(parser):
Expand All @@ -43,6 +47,17 @@ def create_compare_arguments(parser):
parser.add_argument("--baseline_deployment_name", type=str, default="")
parser.add_argument("--comparison_deployment_name", type=str, default="")
parser.add_argument("--metric_name", type=str, default="Tests.Overall.rps")
parser.add_argument(
"--from-date",
type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
default=START_TIME_LAST_WEEK_UTC,
help="Only consider regressions with a percentage over the defined limit. (0-100)",
)
parser.add_argument(
"--to-date",
type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
default=START_TIME_NOW_UTC,
)
parser.add_argument(
"--metric_mode",
type=str,
Expand Down Expand Up @@ -77,9 +92,8 @@ def create_compare_arguments(parser):
)
parser.add_argument(
"--from_timestamp",
type=int,
default=LAST_WEEK_UTC,
default=None,
help="The minimum period to use for the the value fetching",
)
parser.add_argument("--to_timestamp", type=int, default=NOW_UTC)
parser.add_argument("--to_timestamp", default=None)
return parser
7 changes: 6 additions & 1 deletion redisbench_admin/compare/compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ def compare_command_logic(args, project_name, project_version):
)
from_ts_ms = args.from_timestamp
to_ts_ms = args.to_timestamp
if from_ts_ms is None:
from_ts_ms = int(args.from_date.timestamp() * 1000)
if to_ts_ms is None:
to_ts_ms = int(args.to_date.timestamp() * 1000)
from_human_str = humanize.naturaltime(
dt.datetime.utcfromtimestamp(from_ts_ms / 1000)
)
Expand Down Expand Up @@ -336,12 +340,13 @@ def compare_command_logic(args, project_name, project_version):

logging.info("Printing differential analysis between branches")
writer = MarkdownTableWriter(
table_name="Comparison between {} and {} for metric: {}. Time Period from {} to {}".format(
table_name="Comparison between {} and {} for metric: {}. Time Period from {} to {}. (environment used: {})".format(
baseline_branch,
comparison_branch,
metric_name,
from_human_str,
to_human_str,
baseline_deployment_name,
),
headers=[
"Test Case",
Expand Down
2 changes: 1 addition & 1 deletion redisbench_admin/run/ann/pkg