Skip to content

Commit a69dc1d

Browse files
chentexchentex
committed
Updates benchmark names
Signed-off-by: Vicente Zepeda Mas <[email protected]>
1 parent b9ddc34 commit a69dc1d

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ python3.7 ./snafu/run_snafu.py --tool archive --archive-file /tmp/my_sysbench_da
9393
| YCSB | Database Performance | Working |
9494
| Pgbench | Postgres Performance | Working |
9595
| smallfile | metadata-intensive ops | Working |
96-
| fs-drift | metadata-intensive mix | Working |
96+
| fs_drift | metadata-intensive mix | Working |
9797
| cyclictest | Real-Time Latency | Working |
9898
| oslat | Real-Time Latency | Working |
9999
| OpenShift Upgrade | Time to upgrade | Working |

‎ci/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function update_operator_image() {
2929
sed -i "s#${default_ripsaw_image_prefix}/fio:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/fio:${SNAFU_IMAGE_TAG}#g" roles/fio_distributed/templates/*
3030
sed -i "s#${default_ripsaw_image_prefix}/ycsb-server:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/ycsb-server:${SNAFU_IMAGE_TAG}#g" roles/ycsb/templates/*
3131
sed -i "s#${default_ripsaw_image_prefix}/pgbench:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/pgbench:${SNAFU_IMAGE_TAG}#g" roles/pgbench/defaults/main.yml
32-
sed -i "s#${default_ripsaw_image_prefix}/fs-drift:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/fs-drift:${SNAFU_IMAGE_TAG}#g" roles/fs-drift/templates/* roles/fs-drift/tasks/*
32+
sed -i "s#${default_ripsaw_image_prefix}/fs_drift:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/fs_drift:${SNAFU_IMAGE_TAG}#g" roles/fs_drift/templates/* roles/fs_drift/tasks/*
3333
sed -i "s#${default_ripsaw_image_prefix}/smallfile:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/smallfile:${SNAFU_IMAGE_TAG}#g" roles/smallfile/templates/* roles/smallfile/tasks/*
3434
image_spec=$image_location/$image_account/benchmark-operator:$SNAFU_IMAGE_TAG
3535
make image-build image-push deploy IMG=$image_spec

‎snafu/fs_drift_wrapper/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
55
COPY . /opt/snafu/
66
RUN pip3 install --upgrade pip
77
RUN pip3 install -e /opt/snafu/
8-
ADD https://api.github.com/repos/parallel-fs-utils/fs-drift/git/refs/heads/master /tmp/bustcache
9-
RUN git clone https://github.com/parallel-fs-utils/fs-drift /opt/fs-drift --depth 1
10-
RUN ln -sv /opt/fs-drift/fs-drift.py /usr/local/bin/
11-
RUN ln -sv /opt/fs-drift/rsptime_stats.py /usr/local/bin/
8+
ADD https://api.github.com/repos/parallel-fs-utils/fs_drift/git/refs/heads/master /tmp/bustcache
9+
RUN git clone https://github.com/parallel-fs-utils/fs_drift /opt/fs_drift --depth 1
10+
RUN ln -sv /opt/fs_drift/fs_drift.py /usr/local/bin/
11+
RUN ln -sv /opt/fs_drift/rsptime_stats.py /usr/local/bin/

‎snafu/fs_drift_wrapper/Dockerfile.ppc64le‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
66
RUN python3 -m pip install --upgrade cython numpy importlib_metadata 'urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1' && python3 -m pip install --upgrade scipy pandas
77
COPY . /opt/snafu/
88
RUN pip3 install -e /opt/snafu/
9-
ADD https://api.github.com/repos/parallel-fs-utils/fs-drift/git/refs/heads/master /tmp/bustcache
10-
RUN git clone https://github.com/parallel-fs-utils/fs-drift /opt/fs-drift --depth 1
11-
RUN ln -sv /opt/fs-drift/fs-drift.py /usr/local/bin/
12-
RUN ln -sv /opt/fs-drift/rsptime_stats.py /usr/local/bin/
9+
ADD https://api.github.com/repos/parallel-fs-utils/fs_drift/git/refs/heads/master /tmp/bustcache
10+
RUN git clone https://github.com/parallel-fs-utils/fs_drift /opt/fs_drift --depth 1
11+
RUN ln -sv /opt/fs_drift/fs_drift.py /usr/local/bin/
12+
RUN ln -sv /opt/fs_drift/rsptime_stats.py /usr/local/bin/

‎snafu/fs_drift_wrapper/ci_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -x
55
source ci/common.sh
66

77
# Build image for ci
8-
image_spec=$SNAFU_WRAPPER_IMAGE_PREFIX/fs-drift:$SNAFU_IMAGE_TAG
8+
image_spec=$SNAFU_WRAPPER_IMAGE_PREFIX/fs_drift:$SNAFU_IMAGE_TAG
99
build_and_push snafu/fs_drift_wrapper/Dockerfile $image_spec
1010
pushd ripsaw
1111
source tests/test_fs_drift.sh

‎snafu/fs_drift_wrapper/fs_drift_wrapper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self, parser):
3333
parser.add_argument(
3434
"-d", "--dir", help="output parent directory", default=os.path.dirname(os.getcwd())
3535
)
36-
parser.add_argument("-y", "--yaml-input-file", help="fs-drift parameters passed via YAML input file")
36+
parser.add_argument("-y", "--yaml-input-file", help="fs_drift parameters passed via YAML input file")
3737
self.args = parser.parse_args()
3838

3939
if not self.args.top:

‎snafu/fs_drift_wrapper/trigger_fs_drift.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ def emit_actions(self):
5151
if c.endswith(".csv"):
5252
os.unlink(os.path.join(rsptime_dir, c))
5353

54-
json_output_file = os.path.join(self.result_dir, "fs-drift.json")
54+
json_output_file = os.path.join(self.result_dir, "fs_drift.json")
5555
network_shared_dir = os.path.join(self.working_dir, "network-shared")
5656
rsptime_file = os.path.join(network_shared_dir, "stats-rsptimes.csv")
5757
cmd = [
58-
"fs-drift.py",
58+
"fs_drift.py",
5959
"--top",
6060
self.working_dir,
6161
"--output-json",
@@ -71,7 +71,7 @@ def emit_actions(self):
7171
process = subprocess.check_call(cmd, stderr=subprocess.STDOUT)
7272
except subprocess.CalledProcessError as e:
7373
self.logger.exception(e)
74-
raise FsDriftWrapperException("fs-drift.py non-zero process return code %d" % e.returncode)
74+
raise FsDriftWrapperException("fs_drift.py non-zero process return code %d" % e.returncode)
7575
self.logger.info("completed sample {} , results in {}".format(self.sample, json_output_file))
7676
fsdict = get_vfs_stat_dict(self.working_dir)
7777
with open(json_output_file) as f:
@@ -118,7 +118,7 @@ def emit_actions(self):
118118
rsptime_date = start_time + int(flds[0])
119119
rsptime_date_str = time.strftime("%Y-%m-%dT%H:%M:%S.000Z", time.gmtime(rsptime_date))
120120
interval = {}
121-
# number of fs-drift file operations in this interval
121+
# number of fs_drift file operations in this interval
122122
interval["op-count"] = int(flds[2])
123123
if interval["op-count"] == 0:
124124
self.logger.info(

‎snafu/utils/wrapper_factory.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
wrapper_dict = {
2626
"fio": fio_wrapper,
2727
"smallfile": smallfile_wrapper,
28-
"fs-drift": fs_drift_wrapper,
28+
"fs_drift": fs_drift_wrapper,
2929
"hammerdb": hammerdb_wrapper,
3030
"ycsb": ycsb_wrapper,
3131
"pgbench": pgbench_wrapper,
3232
"vegeta": vegeta_wrapper,
33-
"scale": scale_openshift_wrapper,
33+
"scale_openshift": scale_openshift_wrapper,
3434
"stressng": stressng_wrapper,
35-
"upgrade": upgrade_openshift_wrapper,
35+
"upgrade_openshift": upgrade_openshift_wrapper,
3636
"cyclictest": cyclictest_wrapper,
3737
"oslat": oslat_wrapper,
3838
"trex": trex_wrapper,

0 commit comments

Comments
 (0)