diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-05-29 14:26:31 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2015-05-29 14:26:31 -0400 |
| commit | 9e0fa60e12b0e0925400a8c7a2ee87caf925e9bb (patch) | |
| tree | f9ff8d4647b212e9af8a641313fdfacc69f5b9c6 | |
| parent | 07f8ccf2b5350128d42319992cda0624b9811c10 (diff) | |
| download | mongo-9e0fa60e12b0e0925400a8c7a2ee87caf925e9bb.tar.gz | |
Rename 'logging' to 'fullckpt_logging'
| -rw-r--r-- | src/txn/txn_ckpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c index 16a7aa86754..f882764c86a 100644 --- a/src/txn/txn_ckpt.c +++ b/src/txn/txn_ckpt.c @@ -351,7 +351,7 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) WT_TXN_ISOLATION saved_isolation; void *saved_meta_next; u_int i; - int full, idle, logging, tracking; + int full, fullckpt_logging, idle, tracking; const char *txn_cfg[] = { WT_CONFIG_BASE(session, WT_SESSION_begin_transaction), "isolation=snapshot", NULL }; @@ -359,7 +359,7 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) txn = &session->txn; txn_global = &conn->txn_global; saved_isolation = session->isolation; - full = idle = logging = tracking = 0; + full = fullckpt_logging = idle = tracking = 0; /* Ensure the metadata table is open before taking any locks. */ WT_RET(__wt_metadata_open(session)); @@ -370,8 +370,8 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) */ WT_RET(__checkpoint_apply_all(session, cfg, NULL, &full)); - /* Configure logging. */ - logging = full && FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED); + /* Configure logging only if doing a full checkpoint. */ + fullckpt_logging = full && FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED); /* * Get a list of handles we want to flush; this may pull closed objects @@ -421,7 +421,7 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) tracking = 1; /* Tell logging that we are about to start a database checkpoint. */ - if (logging) + if (fullckpt_logging) WT_ERR(__wt_txn_checkpoint_log( session, full, WT_TXN_LOG_CKPT_PREPARE, NULL)); @@ -458,7 +458,7 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) txn_checkpoint_generation, txn_global->checkpoint_gen); /* Tell logging that we have started a database checkpoint. */ - if (logging) + if (fullckpt_logging) WT_ERR(__wt_txn_checkpoint_log( session, full, WT_TXN_LOG_CKPT_START, NULL)); @@ -562,7 +562,7 @@ err: /* * Tell logging that we have finished a database checkpoint. Do not * write a log record if the database was idle. */ - if (logging) { + if (fullckpt_logging) { if (ret == 0 && F_ISSET((WT_BTREE *)session->meta_dhandle->handle, WT_BTREE_SKIP_CKPT)) |