diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-02-07 02:24:42 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2020-02-07 02:24:42 +0000 |
| commit | b720ff3c5a6e14eac458f539bb6b83ef46e4435a (patch) | |
| tree | df90e17fec0ff96acddf1ef46296e7e0241cdc84 /src/third_party/wiredtiger/src/meta/meta_turtle.c | |
| parent | f60e5094bb0e582b1eef502b00580d3072ef73d4 (diff) | |
| download | mongo-b720ff3c5a6e14eac458f539bb6b83ef46e4435a.tar.gz | |
Import wiredtiger: 94c6c16014292f335a5094669e850125d7432b14 from branch mongodb-4.4
ref: 168c7f1b38..94c6c16014
for: 4.3.4
WT-4999 Migrate Jenkins “wiredtiger-test-format-stress-zseries” job to Evergreen
WT-5206 Return the correct checkpoint-modified list of blocks
WT-5489 page-read can race with threads locking in-memory page structures
WT-5534 Incremental backup needs to accept older metadata
WT-5537 Use correct WT_ITEM fields per memory sanitizer
Diffstat (limited to 'src/third_party/wiredtiger/src/meta/meta_turtle.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_turtle.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c index 044094133ce..a7b2e740caf 100644 --- a/src/third_party/wiredtiger/src/meta/meta_turtle.c +++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c @@ -185,7 +185,7 @@ __wt_turtle_init(WT_SESSION_IMPL *session) { WT_DECL_RET; char *metaconf, *unused_value; - bool exist_backup, exist_bincr, exist_incr, exist_isrc, exist_turtle; + bool exist_backup, exist_incr, exist_isrc, exist_turtle; bool load, loadTurtle; load = loadTurtle = false; @@ -212,17 +212,6 @@ __wt_turtle_init(WT_SESSION_IMPL *session) WT_RET(__wt_fs_exist(session, WT_LOGINCR_SRC, &exist_isrc)); WT_RET(__wt_fs_exist(session, WT_METADATA_BACKUP, &exist_backup)); WT_RET(__wt_fs_exist(session, WT_METADATA_TURTLE, &exist_turtle)); - /* - * Block incremental is different. If it exists, then we have block incremental information we - * need to keep. Mark the connection as having block-based incremental backup turned on. XXX - - * Need to call something to read it in and set this up. Maybe here, maybe not. - */ - WT_RET(__wt_fs_exist(session, WT_BLKINCR_BACKUP, &exist_bincr)); - if (exist_bincr) { - F_SET(S2C(session), WT_CONN_INCR_BACKUP); - /* Load content into some structure. Not sure this is the right place. It may be too early. - */ - } if (exist_turtle) { /* |