diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-05-04 16:46:25 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-04 07:11:56 +0000 |
| commit | 3174b0ca6254e805983e7e03eae0295d3c48806c (patch) | |
| tree | 45eac69c6e1b8d7c86a535d23457d5209f2405a9 | |
| parent | 10027f122b7d6c8dc7d85156dea26e33472aa293 (diff) | |
| download | mongo-3174b0ca6254e805983e7e03eae0295d3c48806c.tar.gz | |
Import wiredtiger: 859f83a6ccf9bf1361f8aa75c1ba59e5624ea02d from branch mongodb-5.0
ref: 5b6109fa42..859f83a6cc
for: 5.0.0
WT-7423 Clear checkpoint LSN and backup metadata on import
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/schema/schema_create.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 5d2dba54132..19ed0ad74b7 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.0", - "commit": "5b6109fa425d492c42fbb9f259c429a0290865ea" + "commit": "859f83a6ccf9bf1361f8aa75c1ba59e5624ea02d" } diff --git a/src/third_party/wiredtiger/src/schema/schema_create.c b/src/third_party/wiredtiger/src/schema/schema_create.c index 808ee9ab960..02b6e46deac 100644 --- a/src/third_party/wiredtiger/src/schema/schema_create.c +++ b/src/third_party/wiredtiger/src/schema/schema_create.c @@ -205,13 +205,14 @@ __create_file( } /* - * If creating an ordinary file, append the file ID and current version numbers to the passed-in - * configuration and insert the resulting configuration into the metadata. + * If creating an ordinary file, update the file ID and current version numbers and strip the + * incremental backup information and checkpoint LSN from the extracted metadata. */ if (!is_metadata) { if (!import_repair) { WT_ERR(__wt_scr_alloc(session, 0, &val)); - WT_ERR(__wt_buf_fmt(session, val, "id=%" PRIu32 ",version=(major=%d,minor=%d)", + WT_ERR(__wt_buf_fmt(session, val, + "id=%" PRIu32 ",version=(major=%d,minor=%d),checkpoint_backup_info=,checkpoint_lsn=", ++S2C(session)->next_file_id, WT_BTREE_MAJOR_VERSION_MAX, WT_BTREE_MINOR_VERSION_MAX)); for (p = filecfg; *p != NULL; ++p) |