diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-09-01 11:51:22 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-09-01 13:47:27 +1000 |
| commit | 144cb2c717d2d58b7503eab7fa15f28f95772bcc (patch) | |
| tree | 006fe30f0b8e3d2dfaca0fb50d2af8882d2bd9b8 | |
| parent | d34c7cf640a6e12b4f1abe86ef3c96d1216f0654 (diff) | |
| download | mongo-144cb2c717d2d58b7503eab7fa15f28f95772bcc.tar.gz | |
Import wiredtiger: e2c927fa58e275468909deae274ad245e3696a3c from branch mongodb-3.6
ref: bacc9ada53..e2c927fa58
for: 3.5.13
WT-3558 MongoDB test case failing with assertion during checkpoint
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn_ckpt.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index b2e75ab4218..7bf4c00490a 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -1,5 +1,5 @@ { - "commit": "bacc9ada53a46128642343c162a993d15bc80b57", + "commit": "e2c927fa58e275468909deae274ad245e3696a3c", "github": "wiredtiger/wiredtiger.git", "vendor": "wiredtiger", "branch": "mongodb-3.6" diff --git a/src/third_party/wiredtiger/src/txn/txn_ckpt.c b/src/third_party/wiredtiger/src/txn/txn_ckpt.c index e54ec99b590..9b6070b1db1 100644 --- a/src/third_party/wiredtiger/src/txn/txn_ckpt.c +++ b/src/third_party/wiredtiger/src/txn/txn_ckpt.c @@ -309,7 +309,17 @@ __wt_checkpoint_get_handles(WT_SESSION_IMPL *session, const char *cfg[]) ret = __wt_curfile_insert_check(meta_cursor); if (ret == WT_ROLLBACK) { metadata_race = true; + /* + * Disable this check and assertion for now - it is + * possible that a schema operation with a timestamp in + * the future is in the metadata, but not part of the + * the checkpoint now that checkpoints can be created + * at the stable timestamp. + * See WT-3559 for context on re-adding this assertion. + */ +#if 0 ret = 0; +#endif } else metadata_race = false; WT_TRET(__wt_metadata_cursor_release(session, &meta_cursor)); |