From c7d2b5715b459bc38e1a2577bfff32d57364c39b Mon Sep 17 00:00:00 2001 From: "Filipe Oliveira (Personal)" Date: Thu, 2 May 2024 14:20:30 +0100 Subject: [PATCH] Version bump: 2.1.0 (#256) * Release 2.1.0 * Removed CHANGES in favour of release notes of github * continue on failure on openssl macos matrix * using brew prefix instead of static path for openssl libs on macos * Adjusted pkgconfig path in macos to use brew --prefix tool * Increased codecov upload timeout --- .github/workflows/ci.yml | 13 ++---- CHANGES | 97 ---------------------------------------- README.md | 2 +- configure.ac | 2 +- memtier_benchmark.1 | 11 ++++- 5 files changed, 15 insertions(+), 110 deletions(-) delete mode 100644 CHANGES diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c27ba44..0051767a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,13 +88,7 @@ jobs: ./tests/run_tests.sh - name: Capture code coverage - timeout-minutes: 3 - if: matrix.platform == 'ubuntu-latest' - run: | - make code-coverage-capture - - - name: Capture code coverage - timeout-minutes: 3 + timeout-minutes: 6 if: matrix.platform == 'ubuntu-latest' run: | make code-coverage-capture @@ -105,12 +99,13 @@ jobs: matrix: openssl: ["1.1", "3.0"] runs-on: macos-latest + continue-on-error: true steps: - uses: actions/checkout@v1 - name: Install dependencies run: brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }} - name: Build - run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@${{ matrix.openssl }}/lib/pkgconfig ./configure && make + run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make build-macos-openssl-1-0-2: strategy: @@ -124,4 +119,4 @@ jobs: - name: Install openssl v1.0.2 run: brew install rbenv/tap/openssl@1.0 - name: Build - run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@1.0/lib/pkgconfig ./configure && make + run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.0`/lib/pkgconfig ./configure && make diff --git a/CHANGES b/CHANGES deleted file mode 100644 index 576544af..00000000 --- a/CHANGES +++ /dev/null @@ -1,97 +0,0 @@ -* Version 1.3.0 - * Redis 6.x ACL support - * TLS support - * Docker related fixes/cleanups - * Numerous other smaller fixes - -* Version 1.2.17 - * fix parallel key-pattern command line usage - * fix and clean up build on macOS - -* Version 1.2.16 - * Support arbitrary commands - * Add bash completion - -* Version 1.2.15 - * Support "ASK" in cluster mode - -* Version 1.2.14 - * Keep keys to be in key-range when using run-count with parallel key-patten - * Fix keys overlap when using parallel key-patten - -* Version 1.2.13 - * Support "MOVED" in cluster mode - -* Version 1.2.12 - * Fix 64bit keyspace support - -* Version 1.2.11 - * Basic support for redis cluster API. - * Dockerfile support for building & running memtier benchmark in a container - -* Version 1.2.10 - * Fix memory corruption when using randomized values - -* Version 1.2.9 - * Add JSON output support: add thin json handling class that could be overridden for extensive uses - * Add --json-out-file: Name of JSON output file, if not set, will not print to json - * Refactor some code duplications in the prints sections - * Change license to 2017 - * 64bits keyspace - * Fix binary protocol pipelining: always use the actual body length - * Use different values for each key when random data is set - -* Version 1.2.8 - * Optimization of gettimeofday() and latency calculations - * WAIT command support - * Help output fixes and improvements (Nik Sultana) - * CSV output fixes (Saman Barghi) - -* Version 1.2.7 - * Improvement of --randomize - * Minor bugfix in instantaneous stats not begin updated - * Fix incorrect statistics due to integer overflow (Daisy Hsiung). - * Better round-robin address selection when doing hostname resolution. - -* Version 1.2.6 - * Improve latency histogram accuracy and range - * Fix --random-data when using many threads - -* Version 1.2.5 - * Bugfix in --randomize - -* Version 1.2.4 - * Add --randomize - * Fix random seed bug - * Improve statistics accuracy - -* Version 1.2.3 - * Add progress and current (instantaneous) stats - -* Version 1.2.2 - * Add --key-pattern=P:P - * Add -n allkeys - -* Version 1.2.1 - * Add --distinct-client-seed - -* Version 1.2.0 - * Add --data-size-pattern - * Add --key-pattern now has Gaussian distribution, and also --key-stddev, --key-median - * Add --data-offset - * Add --hide-histogram - -* Version 1.1.0 - * Add --data-verify and --verify options to allow data verification. - * Add --no-expiry option to ignore expiry of imported data. - * Binary memcache now supports SASL PLAIN authentication. - -* Version 1.0.2 - * Remove libmemcached dependency. - * Detailed instructions for building on Ubuntu and CentOS distributions. - -* Version 1.0.1 - * Fix build problems on Ubuntu 10.04. - -* Version 1.0.0 - * Initial public release. diff --git a/README.md b/README.md index a0a0f7ee..db40fb65 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ When running `./configure`, if it fails to find libssl it may be necessary to tweak the `PKG_CONFIG_PATH` environment variable: ``` -PKG_CONFIG_PATH=/usr/local/opt/openssl@3.0/lib/pkgconfig ./configure +PKG_CONFIG_PATH=`brew --prefix openssl@3.0`/lib/pkgconfig ./configure ``` #### Building and installing diff --git a/configure.ac b/configure.ac index 6acaa120..a2b67299 100755 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ(2.59) -AC_INIT(memtier_benchmark,2.0.0,oss@redis.com) +AC_INIT(memtier_benchmark,2.1.0,oss@redis.com) AC_CONFIG_SRCDIR([memtier_benchmark.cpp]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE diff --git a/memtier_benchmark.1 b/memtier_benchmark.1 index 186922af..1f706c92 100644 --- a/memtier_benchmark.1 +++ b/memtier_benchmark.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH MEMTIER_BENCHMARK "1" "June 2023" "memtier_benchmark 2.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH MEMTIER_BENCHMARK "1" "April 2024" "memtier_benchmark 2.1.0" "User Commands" .SH NAME memtier_benchmark \- NoSQL benchmark tool .SH SYNOPSIS @@ -53,6 +53,9 @@ Use specified CA certs bundle for TLS \fB\-\-tls\-skip\-verify\fR Skip verification of server certificate .TP +\fB\-\-tls\-protocols\fR +Specify the tls protocol version to use, comma delemited. Use a combination of 'TLSv1', 'TLSv1.1', 'TLSv1.2' and 'TLSv1.3'. +.TP \fB\-\-sni\fR=\fI\,STRING\/\fR Add an SNI header .TP @@ -97,6 +100,10 @@ Display version information Number of total requests per client (default: 10000) use 'allkeys' to run on the entire key\-range .TP +\fB\-\-rate\-limiting\fR=\fI\,NUMBER\/\fR +The max number of requests to make per second from an individual connection (default is unlimited rate). +If you use \fB\-\-rate\-limiting\fR and a very large rate is entered which cannot be met, memtier will do as many requests as possible per second. +.TP \fB\-c\fR, \fB\-\-clients\fR=\fI\,NUMBER\/\fR Number of clients per thread (default: 50) .TP