diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-10-26 18:37:36 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-26 08:06:38 +0000 |
| commit | bf14e84d9f3c1d6bec166d422fb8e3854f228bdd (patch) | |
| tree | 092701663e342d676fb42b976b4f8bba9f59b4f8 /src/third_party | |
| parent | 6a50e1a788a31fba5fa2ac9dc37549a0aca7ba05 (diff) | |
| download | mongo-bf14e84d9f3c1d6bec166d422fb8e3854f228bdd.tar.gz | |
Import wiredtiger: add600e46f1d45162cb05d732cdbcd415e8a915b from branch mongodb-master
ref: 223f91e7c5..add600e46f
for: 6.2.0-rc0
WT-10023 Remove duplicate call to verify in test/format (#8402)
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/t.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 0eb4a4b439e..5a2df723f78 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": "223f91e7c5d70bfad81ef2a736fc7ef838ec7c75" + "commit": "add600e46f1d45162cb05d732cdbcd415e8a915b" } diff --git a/src/third_party/wiredtiger/test/format/t.c b/src/third_party/wiredtiger/test/format/t.c index b7d149d7ccd..632a457d04f 100644 --- a/src/third_party/wiredtiger/test/format/t.c +++ b/src/third_party/wiredtiger/test/format/t.c @@ -383,9 +383,11 @@ skip_operations: /* * Verify the objects. Verify closes the underlying handle and discards the statistics, read - * them first. + * them first. However, for verify_only we've already completed the verification above. Skip + * this one. */ - TIMED_MAJOR_OP(wts_verify(g.wts_conn, true)); + if (!verify_only) + TIMED_MAJOR_OP(wts_verify(g.wts_conn, true)); track("shutting down", 0ULL); wts_close(&g.wts_conn); |