diff options
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/evergreen/verify_wt_datafiles.sh | 13 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/config.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d1cb821972f..819804ea470 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-master", - "commit": "1237b92598f4056b456dd937afeb64481b427f3d" + "commit": "753efa984e0f7bcf1179066b205d34883abb76aa" } diff --git a/src/third_party/wiredtiger/test/evergreen/verify_wt_datafiles.sh b/src/third_party/wiredtiger/test/evergreen/verify_wt_datafiles.sh index 2a16240792f..6293e3f4b38 100755 --- a/src/third_party/wiredtiger/test/evergreen/verify_wt_datafiles.sh +++ b/src/third_party/wiredtiger/test/evergreen/verify_wt_datafiles.sh @@ -56,14 +56,15 @@ for d in ${dirs_include_datafile} do echo "${d}" - ${wt_binary} -h ${d} printlog > /dev/null - if [ "$?" -ne "0" ]; then - echo "Failed to dump '${d}' log files, exiting ..." - exit 1 + # Make sure logging is enabled before running the printlog command. + if grep -q -E "logging=(1|on)" ${d}/CONFIG; then + if ! ${wt_binary} -h ${d} printlog > /dev/null; then + echo "Failed to dump '${d}' log files, exiting ..." + exit 1 + fi fi - tables=$(${wt_binary} -h "${d}" list) - if [ "$?" -ne "0" ]; then + if ! tables=$(${wt_binary} -h "${d}" list); then echo "Failed to list '${d}' directory, exiting ..." exit 1 fi diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c index ffba5bc1028..7f27a54459e 100644 --- a/src/third_party/wiredtiger/test/format/config.c +++ b/src/third_party/wiredtiger/test/format/config.c @@ -1179,8 +1179,10 @@ config_transaction(void) config_off(NULL, "transaction.timestamps"); config_off(NULL, "ops.prepare"); } - if (GV(LOGGING) && config_explicit(NULL, "logging")) + if (GV(LOGGING) && config_explicit(NULL, "logging")) { + config_off(NULL, "transaction.timestamps"); config_off(NULL, "ops.prepare"); + } if (GV(OPS_SALVAGE) && config_explicit(NULL, "ops.salvage")) { /* FIXME WT-6431 */ config_off(NULL, "transaction.timestamps"); config_off(NULL, "ops.prepare"); |