diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/meta/meta_turtle.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_turtle.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c index db790537c79..044094133ce 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_incr, exist_isrc, exist_turtle; + bool exist_backup, exist_bincr, exist_incr, exist_isrc, exist_turtle; bool load, loadTurtle; load = loadTurtle = false; @@ -208,10 +208,22 @@ __wt_turtle_init(WT_SESSION_IMPL *session) * turtle file and an incremental backup file, that is an error. Otherwise, if there's already a * turtle file, we're done. */ - WT_RET(__wt_fs_exist(session, WT_INCREMENTAL_BACKUP, &exist_incr)); - WT_RET(__wt_fs_exist(session, WT_INCREMENTAL_SRC, &exist_isrc)); + WT_RET(__wt_fs_exist(session, WT_LOGINCR_BACKUP, &exist_incr)); + 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) { /* * Failure to read means a bad turtle file. Remove it and create a new turtle file. |