From eb7ae16520c16f92497a470b9ab4bab9221a927f Mon Sep 17 00:00:00 2001 From: Vicente Zepeda Mas Date: Mon, 29 Nov 2021 13:12:23 +0100 Subject: [PATCH] Updates benchmark names Signed-off-by: Vicente Zepeda Mas --- README.md | 2 +- ci/common.sh | 2 +- snafu/fs_drift_wrapper/Dockerfile | 8 ++++---- snafu/fs_drift_wrapper/Dockerfile.ppc64le | 8 ++++---- snafu/fs_drift_wrapper/ci_test.sh | 2 +- snafu/fs_drift_wrapper/fs_drift_wrapper.py | 2 +- snafu/fs_drift_wrapper/trigger_fs_drift.py | 8 ++++---- snafu/utils/wrapper_factory.py | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 8cfd794e6..5f7d1ada1 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ python3.7 ./snafu/run_snafu.py --tool archive --archive-file /tmp/my_sysbench_da | YCSB | Database Performance | Working | | Pgbench | Postgres Performance | Working | | smallfile | metadata-intensive ops | Working | -| fs-drift | metadata-intensive mix | Working | +| fs_drift | metadata-intensive mix | Working | | cyclictest | Real-Time Latency | Working | | oslat | Real-Time Latency | Working | | OpenShift Upgrade | Time to upgrade | Working | diff --git a/ci/common.sh b/ci/common.sh index f49e4480c..e5242ef4c 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -29,7 +29,7 @@ function update_operator_image() { sed -i "s#${default_ripsaw_image_prefix}/fio:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/fio:${SNAFU_IMAGE_TAG}#g" roles/fio_distributed/templates/* sed -i "s#${default_ripsaw_image_prefix}/ycsb-server:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/ycsb-server:${SNAFU_IMAGE_TAG}#g" roles/ycsb/templates/* sed -i "s#${default_ripsaw_image_prefix}/pgbench:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/pgbench:${SNAFU_IMAGE_TAG}#g" roles/pgbench/defaults/main.yml - 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/* + 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/* sed -i "s#${default_ripsaw_image_prefix}/smallfile:latest#${SNAFU_WRAPPER_IMAGE_PREFIX}/smallfile:${SNAFU_IMAGE_TAG}#g" roles/smallfile/templates/* roles/smallfile/tasks/* image_spec=$image_location/$image_account/benchmark-operator:$SNAFU_IMAGE_TAG make image-build image-push deploy IMG=$image_spec diff --git a/snafu/fs_drift_wrapper/Dockerfile b/snafu/fs_drift_wrapper/Dockerfile index b6b58fd77..ce634f974 100644 --- a/snafu/fs_drift_wrapper/Dockerfile +++ b/snafu/fs_drift_wrapper/Dockerfile @@ -5,7 +5,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python COPY . /opt/snafu/ RUN pip3 install --upgrade pip RUN pip3 install -e /opt/snafu/ -ADD https://api.github.com/repos/parallel-fs-utils/fs-drift/git/refs/heads/master /tmp/bustcache -RUN git clone https://github.com/parallel-fs-utils/fs-drift /opt/fs-drift --depth 1 -RUN ln -sv /opt/fs-drift/fs-drift.py /usr/local/bin/ -RUN ln -sv /opt/fs-drift/rsptime_stats.py /usr/local/bin/ +ADD https://api.github.com/repos/parallel-fs-utils/fs_drift/git/refs/heads/master /tmp/bustcache +RUN git clone https://github.com/parallel-fs-utils/fs_drift /opt/fs_drift --depth 1 +RUN ln -sv /opt/fs_drift/fs_drift.py /usr/local/bin/ +RUN ln -sv /opt/fs_drift/rsptime_stats.py /usr/local/bin/ diff --git a/snafu/fs_drift_wrapper/Dockerfile.ppc64le b/snafu/fs_drift_wrapper/Dockerfile.ppc64le index ed8d9f4ef..9e3c15f7d 100755 --- a/snafu/fs_drift_wrapper/Dockerfile.ppc64le +++ b/snafu/fs_drift_wrapper/Dockerfile.ppc64le @@ -6,7 +6,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python 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 COPY . /opt/snafu/ RUN pip3 install -e /opt/snafu/ -ADD https://api.github.com/repos/parallel-fs-utils/fs-drift/git/refs/heads/master /tmp/bustcache -RUN git clone https://github.com/parallel-fs-utils/fs-drift /opt/fs-drift --depth 1 -RUN ln -sv /opt/fs-drift/fs-drift.py /usr/local/bin/ -RUN ln -sv /opt/fs-drift/rsptime_stats.py /usr/local/bin/ +ADD https://api.github.com/repos/parallel-fs-utils/fs_drift/git/refs/heads/master /tmp/bustcache +RUN git clone https://github.com/parallel-fs-utils/fs_drift /opt/fs_drift --depth 1 +RUN ln -sv /opt/fs_drift/fs_drift.py /usr/local/bin/ +RUN ln -sv /opt/fs_drift/rsptime_stats.py /usr/local/bin/ diff --git a/snafu/fs_drift_wrapper/ci_test.sh b/snafu/fs_drift_wrapper/ci_test.sh index cad53ea7a..e50537e67 100755 --- a/snafu/fs_drift_wrapper/ci_test.sh +++ b/snafu/fs_drift_wrapper/ci_test.sh @@ -5,7 +5,7 @@ set -x source ci/common.sh # Build image for ci -image_spec=$SNAFU_WRAPPER_IMAGE_PREFIX/fs-drift:$SNAFU_IMAGE_TAG +image_spec=$SNAFU_WRAPPER_IMAGE_PREFIX/fs_drift:$SNAFU_IMAGE_TAG build_and_push snafu/fs_drift_wrapper/Dockerfile $image_spec pushd ripsaw source tests/test_fs_drift.sh diff --git a/snafu/fs_drift_wrapper/fs_drift_wrapper.py b/snafu/fs_drift_wrapper/fs_drift_wrapper.py index 3bb19f9bb..ec8e9291b 100644 --- a/snafu/fs_drift_wrapper/fs_drift_wrapper.py +++ b/snafu/fs_drift_wrapper/fs_drift_wrapper.py @@ -33,7 +33,7 @@ def __init__(self, parser): parser.add_argument( "-d", "--dir", help="output parent directory", default=os.path.dirname(os.getcwd()) ) - parser.add_argument("-y", "--yaml-input-file", help="fs-drift parameters passed via YAML input file") + parser.add_argument("-y", "--yaml-input-file", help="fs_drift parameters passed via YAML input file") self.args = parser.parse_args() if not self.args.top: diff --git a/snafu/fs_drift_wrapper/trigger_fs_drift.py b/snafu/fs_drift_wrapper/trigger_fs_drift.py index a6e058173..7af81d477 100644 --- a/snafu/fs_drift_wrapper/trigger_fs_drift.py +++ b/snafu/fs_drift_wrapper/trigger_fs_drift.py @@ -51,11 +51,11 @@ def emit_actions(self): if c.endswith(".csv"): os.unlink(os.path.join(rsptime_dir, c)) - json_output_file = os.path.join(self.result_dir, "fs-drift.json") + json_output_file = os.path.join(self.result_dir, "fs_drift.json") network_shared_dir = os.path.join(self.working_dir, "network-shared") rsptime_file = os.path.join(network_shared_dir, "stats-rsptimes.csv") cmd = [ - "fs-drift.py", + "fs_drift.py", "--top", self.working_dir, "--output-json", @@ -71,7 +71,7 @@ def emit_actions(self): process = subprocess.check_call(cmd, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: self.logger.exception(e) - raise FsDriftWrapperException("fs-drift.py non-zero process return code %d" % e.returncode) + raise FsDriftWrapperException("fs_drift.py non-zero process return code %d" % e.returncode) self.logger.info("completed sample {} , results in {}".format(self.sample, json_output_file)) fsdict = get_vfs_stat_dict(self.working_dir) with open(json_output_file) as f: @@ -118,7 +118,7 @@ def emit_actions(self): rsptime_date = start_time + int(flds[0]) rsptime_date_str = time.strftime("%Y-%m-%dT%H:%M:%S.000Z", time.gmtime(rsptime_date)) interval = {} - # number of fs-drift file operations in this interval + # number of fs_drift file operations in this interval interval["op-count"] = int(flds[2]) if interval["op-count"] == 0: self.logger.info( diff --git a/snafu/utils/wrapper_factory.py b/snafu/utils/wrapper_factory.py index 595aaae54..f5f9e0fd7 100644 --- a/snafu/utils/wrapper_factory.py +++ b/snafu/utils/wrapper_factory.py @@ -25,14 +25,14 @@ wrapper_dict = { "fio": fio_wrapper, "smallfile": smallfile_wrapper, - "fs-drift": fs_drift_wrapper, + "fs_drift": fs_drift_wrapper, "hammerdb": hammerdb_wrapper, "ycsb": ycsb_wrapper, "pgbench": pgbench_wrapper, "vegeta": vegeta_wrapper, - "scale": scale_openshift_wrapper, + "scale_openshift": scale_openshift_wrapper, "stressng": stressng_wrapper, - "upgrade": upgrade_openshift_wrapper, + "upgrade_openshift": upgrade_openshift_wrapper, "cyclictest": cyclictest_wrapper, "oslat": oslat_wrapper, "trex": trex_wrapper,