diff options
author | Luke Chen <luke.chen@mongodb.com> | 2021-12-21 17:27:10 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-21 07:28:21 +0000 |
commit | 6da52123f2e030c1525dbf986d5fc604216ce039 (patch) | |
tree | 09cc003f455eb381f2d73ef6ada78556c15ddb78 | |
parent | 77366e1ffc146cf2ced8a3946587b2b54b076e98 (diff) | |
download | mongo-6da52123f2e030c1525dbf986d5fc604216ce039.tar.gz |
Import wiredtiger: eb062defe28d609bba2f846faf00db33d228abc1 from branch mongodb-5.2
ref: fb1f8e34b9..eb062defe2
for: 5.2.0-rc2
Reverted ticket(s):
WT-8149 Updating metadata salvage csuite test to handle salvaging table metadata without salvaging file metadata
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 740edd3df83..9df6cd7d22e 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-5.2", - "commit": "fb1f8e34b9d7e35f7f7a86609b1868ff33cd2022" + "commit": "eb062defe28d609bba2f846faf00db33d228abc1" } diff --git a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c index 1de7ad55c80..9737cab9b3d 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c @@ -288,15 +288,7 @@ verify_metadata(WT_CONNECTION *conn, TABLE_INFO *tables) else if (t->verified != true) printf("%s not seen in metadata\n", t->name); else { - if ((ret = wt_session->open_cursor(wt_session, t->name, NULL, NULL, &cursor)) != 0) { - /* - * It is possible for the metadata file to contain a table entry and no associated - * file entry as WiredTiger didn't salvage the block associated with the file entry. - */ - if (ret == ENOENT) - continue; - testutil_die(ret, "failed to open cursor on table"); - } + testutil_check(wt_session->open_cursor(wt_session, t->name, NULL, NULL, &cursor)); while ((ret = cursor->next(cursor)) == 0) { testutil_check(cursor->get_value(cursor, &kv)); testutil_assert(strcmp(kv, VALUE) == 0); |