diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-04-01 07:11:40 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-04-01 07:11:40 +1100 |
| commit | af735d14a603a6ef6256a6685f09ec13755a5024 (patch) | |
| tree | eaa614fc686c4681694fff78442027d390503288 /src/session | |
| parent | 16be8160ea3682f18df9bcc6d5addda0c0114137 (diff) | |
| parent | 423f4e11050f7644b1a8d2b6b1cc60c35ef915c8 (diff) | |
| download | mongo-af735d14a603a6ef6256a6685f09ec13755a5024.tar.gz | |
Merge branch 'develop' into mongodb-3.6
Diffstat (limited to 'src/session')
| -rw-r--r-- | src/session/session_api.c | 11 | ||||
| -rw-r--r-- | src/session/session_compact.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/session/session_api.c b/src/session/session_api.c index 3d13287fbe6..b7daf0e2e02 100644 --- a/src/session/session_api.c +++ b/src/session/session_api.c @@ -1206,10 +1206,15 @@ __wt_session_range_truncate(WT_SESSION_IMPL *session, done: err: /* - * Close any locally-opened start cursor. + * Close any locally-opened start cursor. Reset application cursors, + * they've possibly moved and the application cannot use them. */ if (local_start) WT_TRET(start->close(start)); + else + WT_TRET(start->reset(start)); + if (stop != NULL) + WT_TRET(stop->reset(stop)); return (ret); } @@ -1497,7 +1502,7 @@ __transaction_sync_run_chk(WT_SESSION_IMPL *session) conn = S2C(session); - return (FLD_ISSET(conn->flags, WT_CONN_LOG_SERVER_RUN)); + return (FLD_ISSET(conn->flags, WT_CONN_SERVER_LOG)); } /* @@ -1807,7 +1812,7 @@ __open_session(WT_CONNECTION_IMPL *conn, * closes the connection. This is particularly intended to catch * cases where server threads open sessions. */ - WT_ASSERT(session, F_ISSET(conn, WT_CONN_SERVER_RUN)); + WT_ASSERT(session, !F_ISSET(conn, WT_CONN_CLOSING)); /* Find the first inactive session slot. */ for (session_ret = conn->sessions, diff --git a/src/session/session_compact.c b/src/session/session_compact.c index 85214ae6d98..72c072e0fb8 100644 --- a/src/session/session_compact.c +++ b/src/session/session_compact.c @@ -210,7 +210,7 @@ __compact_checkpoint(WT_SESSION_IMPL *session) * work we need to have done is done in the underlying block manager. */ const char *checkpoint_cfg[] = { - WT_CONFIG_BASE(session, WT_SESSION_checkpoint), "force=1", NULL }; + WT_CONFIG_BASE(session, WT_SESSION_checkpoint), "force=1", NULL }; /* Checkpoints take a lot of time, check if we've run out. */ WT_RET(__wt_session_compact_check_timeout(session)); |