diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-05-27 15:51:43 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-05-27 15:51:52 +1000 |
| commit | f5be31696774455a67ca8c3f6268252d1d4086a4 (patch) | |
| tree | 9ab8d44354f28d9e2db7309ab81fc4ae71dc102e /src/third_party/wiredtiger/test/format/ops.c | |
| parent | 832d65c6eec6eb4314b2700a18a332185b5baa36 (diff) | |
| download | mongo-f5be31696774455a67ca8c3f6268252d1d4086a4.tar.gz | |
Import wiredtiger-wiredtiger-2.8.0-441-g6f9a7a4.tar.gz from wiredtiger branch mongodb-3.4
ref: 636a7b2..6f9a7a4
WT-2554 Implement a framework for adding C test cases
WT-2610 Investigate eviction hazard pointer check
WT-2611 wtperf and/or WT_CONFIG_PARSER do not allow escaped double quotes
WT-2617 Bug in pluggable file system example
WT-2624 snprintf unsupported on MSVC 2013
WT-2626 snprintf errors with macro redefinition on MSVC2015
WT-2627 Coverity complaints
WT-2628 reconciliation can return without unlocking the page lock
WT-2629 Introduction of ppc64le crc32c assembly file has made the stack executable
WT-2630 Rename WT_FSTREAM methods to avoid using C99 reserved names
WT-2632 Test format failures due to "checkpoints cannot be dropped when in-use"
WT-2637 The file-extension documentation doesn't cover not-supported cases
WT-2644 'wt load -r' (rename) fails with LSM
WT-2646 Split the lock_wait flag into two, adding a checkpoint_wait flag
WT-2651 Coverity 1355591 resource leak
WT-2653 the custom file-system example should show device configuration
WT-2656 Builds failing on GCC 4.7 builder
WT-2659 csuite tests, assorted lint and cleanup.
WT-2660 Hang between eviction and connection close
WT-2661 Coverity failures: 1356050-1356053
WT-2662 For internal spell checking, strip out double quote literals, they confuse aspell
SERVER-24151 WiredTiger changes for MongoDB 3.3.7
Diffstat (limited to 'src/third_party/wiredtiger/test/format/ops.c')
| -rw-r--r-- | src/third_party/wiredtiger/test/format/ops.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/test/format/ops.c b/src/third_party/wiredtiger/test/format/ops.c index 9275d7f3856..7fd5563f486 100644 --- a/src/third_party/wiredtiger/test/format/ops.c +++ b/src/third_party/wiredtiger/test/format/ops.c @@ -530,9 +530,16 @@ ops(void *arg) ckpt_config = ckpt_name; } - testutil_checkfmt( - session->checkpoint(session, ckpt_config), - "%s", ckpt_config == NULL ? "" : ckpt_config); + ret = session->checkpoint(session, ckpt_config); + /* + * We may be trying to create a named checkpoint while + * we hold a cursor open to the previous checkpoint. + * Tolerate EBUSY. + */ + if (ret != 0 && ret != EBUSY) + testutil_die(ret, "%s", + ckpt_config == NULL ? "" : ckpt_config); + ret = 0; if (ckpt_config != NULL) testutil_check( |