diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-08-17 15:56:33 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-17 06:16:56 +0000 |
| commit | b2c2c5e28402f113ac52f6ce5e629d59fc09b995 (patch) | |
| tree | f66c98f6fbbc5fae973620de07d2f6e262c0bd44 /src/third_party/wiredtiger/src/meta | |
| parent | 3cc779415f2777223b5549d3dfd1b85eef01842b (diff) | |
| download | mongo-b2c2c5e28402f113ac52f6ce5e629d59fc09b995.tar.gz | |
Import wiredtiger: 1a3371324597a8f124c126c2df11303ded4d8dd9 from branch mongodb-4.6
ref: 1124e23db6..1a33713245
for: 4.5.1
WT-5940 Migrate to Clang Format 10
WT-6000 Enhance incremental backup testing in format to support restart
WT-6471 Avoid the error message for non-existent clang-format binary
WT-6560 Fix usage of global salvage in WT utility
WT-6577 History store dump outputs confusing time window
WT-6586 Tombstone inserted to history store should also be flagged as WT_UPDATE_HS
Diffstat (limited to 'src/third_party/wiredtiger/src/meta')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_ckpt.c | 10 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_turtle.c | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_ckpt.c b/src/third_party/wiredtiger/src/meta/meta_ckpt.c index 65dae99e577..d812713d1d5 100644 --- a/src/third_party/wiredtiger/src/meta/meta_ckpt.c +++ b/src/third_party/wiredtiger/src/meta/meta_ckpt.c @@ -359,9 +359,8 @@ __wt_meta_block_metadata(WT_SESSION_IMPL *session, const char *config, WT_CKPT * */ WT_ERR(__wt_config_gets(session, filecfg, "encryption", &cval)); WT_ERR(__wt_buf_fmt(session, b, - "encryption=%.*s," - "block_metadata_encrypted=%s,block_metadata=[%.*s]", - (int)cval.len, cval.str, kencryptor == NULL ? "false" : "true", (int)metadata_len, metadata)); + "encryption=%.*s,block_metadata_encrypted=%s,block_metadata=[%.*s]", (int)cval.len, cval.str, + kencryptor == NULL ? "false" : "true", (int)metadata_len, metadata)); WT_ERR(__wt_strndup(session, b->data, b->size, &ckpt->block_metadata)); err: @@ -973,9 +972,8 @@ __ckpt_version_chk(WT_SESSION_IMPL *session, const char *fname, const char *conf (majorv == WT_BTREE_MAJOR_VERSION_MIN && minorv < WT_BTREE_MINOR_VERSION_MIN) || (majorv == WT_BTREE_MAJOR_VERSION_MAX && minorv > WT_BTREE_MINOR_VERSION_MAX)) WT_RET_MSG(session, EACCES, - "%s is an unsupported WiredTiger source file version %d.%d" - "; this WiredTiger build only supports versions from %d.%d " - "to %d.%d", + "%s is an unsupported WiredTiger source file version %d.%d; this WiredTiger build only " + "supports versions from %d.%d to %d.%d", fname, majorv, minorv, WT_BTREE_MAJOR_VERSION_MIN, WT_BTREE_MINOR_VERSION_MIN, WT_BTREE_MAJOR_VERSION_MAX, WT_BTREE_MINOR_VERSION_MAX); return (0); diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c index dfaaff0d243..0ed6257060a 100644 --- a/src/third_party/wiredtiger/src/meta/meta_turtle.c +++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c @@ -283,17 +283,13 @@ __wt_turtle_init(WT_SESSION_IMPL *session) * incremental backup file and a destination database that incorrectly ran recovery. */ if (exist_incr && !exist_isrc) - WT_RET_MSG(session, EINVAL, - "Incremental backup after running recovery " - "is not allowed"); + WT_RET_MSG(session, EINVAL, "Incremental backup after running recovery is not allowed"); /* * If we have a backup file and metadata and turtle files, we want to recreate the metadata * from the backup. */ if (exist_backup) { - WT_RET(__wt_msg(session, - "Both %s and %s exist; recreating metadata from " - "backup", + WT_RET(__wt_msg(session, "Both %s and %s exist; recreating metadata from backup", WT_METADATA_TURTLE, WT_METADATA_BACKUP)); WT_RET(__wt_remove_if_exists(session, WT_METAFILE, false)); WT_RET(__wt_remove_if_exists(session, WT_METADATA_TURTLE, false)); |