summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2015-08-11 21:51:12 +1000
committerMichael Cahill <michael.cahill@mongodb.com>2015-08-11 21:51:12 +1000
commitdf9836b1b2c8d21af51131710465b84a64d4b14b (patch)
tree4443e123cfac8567d1bb8fc6f1b537c510b05ba7
parent7383e534e1f440dd77e17c985977ea136d9a37a4 (diff)
downloadmongo-df9836b1b2c8d21af51131710465b84a64d4b14b.tar.gz
WT-2038 In the mongodb-3.0 branch, we need the handle list lock when expiring handles.
-rw-r--r--src/conn/conn_sweep.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c
index d6eb316f611..b23c8151db1 100644
--- a/src/conn/conn_sweep.c
+++ b/src/conn/conn_sweep.c
@@ -133,8 +133,9 @@ __sweep_expire(WT_SESSION_IMPL *session, time_t now)
now <= dhandle->timeofdeath + conn->sweep_idle_time)
continue;
- WT_WITH_DHANDLE(session, dhandle,
- ret = __sweep_expire_one(session));
+ WT_WITH_DHANDLE_LOCK(session,
+ WT_WITH_DHANDLE(session, dhandle,
+ ret = __sweep_expire_one(session)));
WT_RET_BUSY_OK(ret);
}