summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2016-11-01 14:48:43 +1100
committerMichael Cahill <michael.cahill@mongodb.com>2016-11-01 14:48:43 +1100
commit04cdcbdafd529588d8a4a80ecc308ad01d507a55 (patch)
tree72a936deb16cd99d3f42c75007ddf6d68bdf7b37 /src
parent4959914aae90ea8c11404b28c06a5684026c761e (diff)
downloadmongo-04cdcbdafd529588d8a4a80ecc308ad01d507a55.tar.gz
WT-2953 Only test for checkpoint/LAS collision if LAS was used. (#3111)
Diffstat (limited to 'src')
-rw-r--r--src/reconcile/rec_write.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/reconcile/rec_write.c b/src/reconcile/rec_write.c
index 810f3fd976b..fe288beed15 100644
--- a/src/reconcile/rec_write.c
+++ b/src/reconcile/rec_write.c
@@ -547,8 +547,11 @@ __rec_write_status(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page)
btree = S2BT(session);
mod = page->modify;
- /* Check for a lookaside table and checkpoint collision. */
- if (__rec_las_checkpoint_test(session, r))
+ /*
+ * If we have used the lookaside table, check for a lookaside table and
+ * checkpoint collision.
+ */
+ if (r->cache_write_lookaside && __rec_las_checkpoint_test(session, r))
return (EBUSY);
/*