Skip to content

Commit c7d2b57

Browse files
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
1 parent 46bfa95 commit c7d2b57

File tree

5 files changed

+15
-110
lines changed

5 files changed

+15
-110
lines changed

.github/workflows/ci.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,7 @@ jobs:
8888
./tests/run_tests.sh
8989
9090
- name: Capture code coverage
91-
timeout-minutes: 3
92-
if: matrix.platform == 'ubuntu-latest'
93-
run: |
94-
make code-coverage-capture
95-
96-
- name: Capture code coverage
97-
timeout-minutes: 3
91+
timeout-minutes: 6
9892
if: matrix.platform == 'ubuntu-latest'
9993
run: |
10094
make code-coverage-capture
@@ -105,12 +99,13 @@ jobs:
10599
matrix:
106100
openssl: ["1.1", "3.0"]
107101
runs-on: macos-latest
102+
continue-on-error: true
108103
steps:
109104
- uses: actions/checkout@v1
110105
- name: Install dependencies
111106
run: brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }}
112107
- name: Build
113-
run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@${{ matrix.openssl }}/lib/pkgconfig ./configure && make
108+
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make
114109

115110
build-macos-openssl-1-0-2:
116111
strategy:
@@ -124,4 +119,4 @@ jobs:
124119
- name: Install openssl v1.0.2
125120
run: brew install rbenv/tap/[email protected]
126121
- name: Build
127-
run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig ./configure && make
122+
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix [email protected]`/lib/pkgconfig ./configure && make

CHANGES

-97
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ When running `./configure`, if it fails to find libssl it may be necessary to
9191
tweak the `PKG_CONFIG_PATH` environment variable:
9292

9393
```
94-
PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig ./configure
94+
PKG_CONFIG_PATH=`brew --prefix [email protected]`/lib/pkgconfig ./configure
9595
```
9696

9797
#### Building and installing

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
1616
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
AC_PREREQ(2.59)
19-
AC_INIT(memtier_benchmark,2.0.0,[email protected])
19+
AC_INIT(memtier_benchmark,2.1.0,[email protected])
2020
AC_CONFIG_SRCDIR([memtier_benchmark.cpp])
2121
AC_CONFIG_HEADER([config.h])
2222
AM_INIT_AUTOMAKE

memtier_benchmark.1

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
2-
.TH MEMTIER_BENCHMARK "1" "June 2023" "memtier_benchmark 2.0.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH MEMTIER_BENCHMARK "1" "April 2024" "memtier_benchmark 2.1.0" "User Commands"
33
.SH NAME
44
memtier_benchmark \- NoSQL benchmark tool
55
.SH SYNOPSIS
@@ -53,6 +53,9 @@ Use specified CA certs bundle for TLS
5353
\fB\-\-tls\-skip\-verify\fR
5454
Skip verification of server certificate
5555
.TP
56+
\fB\-\-tls\-protocols\fR
57+
Specify the tls protocol version to use, comma delemited. Use a combination of 'TLSv1', 'TLSv1.1', 'TLSv1.2' and 'TLSv1.3'.
58+
.TP
5659
\fB\-\-sni\fR=\fI\,STRING\/\fR
5760
Add an SNI header
5861
.TP
@@ -97,6 +100,10 @@ Display version information
97100
Number of total requests per client (default: 10000)
98101
use 'allkeys' to run on the entire key\-range
99102
.TP
103+
\fB\-\-rate\-limiting\fR=\fI\,NUMBER\/\fR
104+
The max number of requests to make per second from an individual connection (default is unlimited rate).
105+
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.
106+
.TP
100107
\fB\-c\fR, \fB\-\-clients\fR=\fI\,NUMBER\/\fR
101108
Number of clients per thread (default: 50)
102109
.TP

0 commit comments

Comments
 (0)