diff options
| author | Chenhao Qu <chenhao.qu@mongodb.com> | 2021-12-29 13:08:37 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-29 02:38:56 +0000 |
| commit | b3a66de85077da1e8304bb3e86736f1f061c5419 (patch) | |
| tree | 7b876748784b11cfb61a44b2b4df866ea1321f3d | |
| parent | 2ea564e14717b2d091486e53b92c9ac58cad40f6 (diff) | |
| download | mongo-b3a66de85077da1e8304bb3e86736f1f061c5419.tar.gz | |
Import wiredtiger: aab21d5814193dc1943d9f5e62fd40ad6973475a from branch mongodb-master
ref: 79c2e12ea7..aab21d5814
for: 5.3.0
WT-8610 Fix counter use
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/csuite/tiered_abort/main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 4ccc0a78ca4..5f480ff997f 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "79c2e12ea706ff1653154e87b2b51fe437be79a7" + "commit": "aab21d5814193dc1943d9f5e62fd40ad6973475a" } diff --git a/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c b/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c index 36032aa4437..ebee074c765 100644 --- a/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c @@ -243,7 +243,7 @@ thread_flush_run(void *arg) */ (void)unlink(sentinel_file); testutil_check(td->conn->open_session(td->conn, NULL, NULL, &session)); - for (i = 0;; ++i) { + for (i = 0;;) { sleep_time = __wt_random(&rnd) % MAX_FLUSH_INVL; sleep(sleep_time); testutil_check(td->conn->query_timestamp(td->conn, ts_string, "get=last_checkpoint")); @@ -264,7 +264,7 @@ thread_flush_run(void *arg) * Create the sentinel file so that the parent process knows the desired number of * flush_tier calls have finished and can start its timer. */ - if (i == flush_calls) { + if (++i == flush_calls) { testutil_assert_errno((fp = fopen(sentinel_file, "w")) != NULL); testutil_assert_errno(fclose(fp) == 0); } |