diff options
Diffstat (limited to 'src/third_party/wiredtiger/test/format/config.c')
| -rw-r--r-- | src/third_party/wiredtiger/test/format/config.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c index 13d91b793e3..f244df90452 100644 --- a/src/third_party/wiredtiger/test/format/config.c +++ b/src/third_party/wiredtiger/test/format/config.c @@ -31,6 +31,7 @@ static void config_backup_incr(void); static void config_backup_incr_granularity(void); +static void config_backup_incr_log_compatibility_check(void); static void config_backward_compatible(void); static void config_cache(void); static void config_checkpoint(void); @@ -267,12 +268,8 @@ config_backup_incr(void) * archival doesn't seem as useful as testing backup, let the backup configuration override. */ if (config_is_perm("backup.incremental")) { - if (g.c_backup_incr_flag == INCREMENTAL_LOG) { - if (g.c_logging_archive && config_is_perm("logging.archive")) - testutil_die(EINVAL, "backup.incremental=log is incompatible with logging.archive"); - if (g.c_logging_archive) - config_single("logging.archive=0", false); - } + if (g.c_backup_incr_flag == INCREMENTAL_LOG) + config_backup_incr_log_compatibility_check(); if (g.c_backup_incr_flag == INCREMENTAL_BLOCK) config_backup_incr_granularity(); return; @@ -761,6 +758,23 @@ config_in_memory_reset(void) } /* + * config_backup_incr_compatibility_check -- + * Backup incremental log compatibility check. + */ +static void +config_backup_incr_log_compatibility_check(void) +{ + /* + * Incremental backup using log files is incompatible with logging archival. Disable logging + * archival if log incremental backup is set. + */ + if (g.c_logging_archive && config_is_perm("logging.archive")) + testutil_die(EINVAL, "backup.incremental=log is incompatible with logging.archive"); + if (g.c_logging_archive) + config_single("logging.archive=0", false); +} + +/* * config_lsm_reset -- * LSM configuration review. */ @@ -801,6 +815,7 @@ config_lsm_reset(void) case 2: /* 50% */ config_single("backup.incremental=log", false); + config_backup_incr_log_compatibility_check(); break; } } |