Skip to content

Commit

Permalink
Reduce durability.interval_ms lower bound to 1ms (NFSE-5140) (#178)
Browse files Browse the repository at this point in the history
* Fix libmicrohttpd deprecation warnings (#169)

Signed-off-by: Tristan Partin <tpartin@micron.com>
(cherry picked from commit b16a16c)

* Reduce durability.interval_ms lower bound to 1ms (NFSE-5140). (#177)

Signed-off-by: Nabeel M Mohamed <50154757+nabeelmmd@users.noreply.github.com>
(cherry picked from commit 96833e1)

* Github workflow changes for 2.1.1

Signed-off-by: Nabeel M Mohamed <50154757+nabeelmmd@users.noreply.github.com>

Co-authored-by: Tristan Partin <tpartin@micron.com>
  • Loading branch information
nabeelmmd and tristan957 authored Jan 21, 2022
1 parent 90a1936 commit e807eb1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Setup
run: |
meson builddir -Dbuildtype=${{ matrix.buildtype }} --fatal-meson-warnings -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
meson builddir -Dbuildtype=${{ matrix.buildtype }} -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
- name: Build
run: |
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Setup
run: |
meson builddir -Dbuildtype=${{ matrix.buildtype }} --fatal-meson-warnings -Dpmem=enabled -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
meson builddir -Dbuildtype=${{ matrix.buildtype }} -Dpmem=enabled -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
- name: Build
run: |
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
- name: Setup
run: |
meson builddir -Dbuildtype=${{ matrix.buildtype }} --fatal-meson-warnings -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
meson builddir -Dbuildtype=${{ matrix.buildtype }} -Ddocs=disabled -Dbindings=all -Dycsb=true -Dwerror=true
- name: Build
run: |
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Setup
run: |
meson builddir -Dbuildtype=${{ matrix.buildtype }} --fatal-meson-warnings -Ddocs=disabled -Dbindings=all -Dycsb=true -Db_sanitize=address,undefined
meson builddir -Dbuildtype=${{ matrix.buildtype }} -Ddocs=disabled -Dbindings=all -Dycsb=true -Db_sanitize=address,undefined
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup
run: |
meson builddir --fatal-meson-warnings -Dwerror=true -Ddocs=enabled -Dtests=false -Dtools=disabled -Dbindings=none -Dcli=false -Dsamples=false -Ddb_bench=false
meson builddir -Dwerror=true -Ddocs=enabled -Dtests=false -Dtools=disabled -Dbindings=none -Dcli=false -Dsamples=false -Ddb_bench=false
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Setup
run: |
meson builddir -Dbuildtype=${{ matrix.build_type }} --fatal-meson-warnings -Dycsb=true
meson builddir -Dbuildtype=${{ matrix.build_type }} -Dycsb=true
- name: Test
run: |
Expand Down
2 changes: 1 addition & 1 deletion lib/include/hse_ikvdb/wal.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <hse_ikvdb/kvs.h>
#include <hse_ikvdb/tuple.h>

#define HSE_WAL_DUR_MS_MIN (25)
#define HSE_WAL_DUR_MS_MIN (1)
#define HSE_WAL_DUR_MS_DFLT (100)
#define HSE_WAL_DUR_MS_MAX (1000)

Expand Down
14 changes: 5 additions & 9 deletions lib/util/src/rest_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,15 @@

#include <bsd/string.h>
#include <cjson/cJSON.h>
#include <cjson/cJSON_Utils.h>

#define SESSIONS_PER_THREAD 5
#define NUM_THREADS 3
#define MAX_SESSIONS (SESSIONS_PER_THREAD * NUM_THREADS)
#define WQ_THREADS 5

#ifndef MHD_HTTP_NOT_ACCEPTABLE
#define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
#endif

#ifndef MHD_HTTP_TOO_MANY_REQUESTS
#define MHD_HTTP_TOO_MANY_REQUESTS 429
/* Required for building with libmicrohttpd >= 0.9.75 */
#ifndef MHD_HTTP_UNPROCESSABLE_CONTENT
#define MHD_HTTP_UNPROCESSABLE_CONTENT MHD_HTTP_UNPROCESSABLE_ENTITY
#endif

#define KV_PAIR_MAX 16
Expand Down Expand Up @@ -795,7 +791,7 @@ webserver_response(

err = string_validate(path, REST_URL_LEN_MAX);
if (ev(err)) {
http_status = MHD_HTTP_UNPROCESSABLE_ENTITY;
http_status = MHD_HTTP_UNPROCESSABLE_CONTENT;
goto respond;
}

Expand Down Expand Up @@ -853,7 +849,7 @@ webserver_response(
MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, &extract_kv_pairs, session);

if (ev(session->targ.iter.err)) {
http_status = MHD_HTTP_UNPROCESSABLE_ENTITY;
http_status = MHD_HTTP_UNPROCESSABLE_CONTENT;
err = session->targ.iter.err;
goto respond;
}
Expand Down

0 comments on commit e807eb1

Please sign in to comment.