summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 15:23:52 +1100
committerMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 15:23:52 +1100
commit03a22601bfe0f3dfe53cfb2cb7759049eb327df0 (patch)
treecf2cdc94153d614a9d4ba6525d07d2103784d0a5
parent4df72e8e20139ddf667e1f0d3b6b7dcf91deb006 (diff)
downloadmongo-03a22601bfe0f3dfe53cfb2cb7759049eb327df0.tar.gz
Revert some debugging changes.
-rw-r--r--src/conn/conn_dhandle.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conn/conn_dhandle.c b/src/conn/conn_dhandle.c
index 6b6b0bfd650..184fac26d7c 100644
--- a/src/conn/conn_dhandle.c
+++ b/src/conn/conn_dhandle.c
@@ -65,10 +65,8 @@ __conn_dhandle_open_lock(
* If the handle is already open for a special operation,
* give up.
*/
- if (F_ISSET(btree, WT_BTREE_SPECIAL_FLAGS)) {
- printf("Collided with special flags\n");
+ if (F_ISSET(btree, WT_BTREE_SPECIAL_FLAGS))
return (EBUSY);
- }
/*
* If the handle is open, get a read lock and recheck.
@@ -111,11 +109,9 @@ __conn_dhandle_open_lock(
/* We have an exclusive lock, we're done. */
F_SET(dhandle, WT_DHANDLE_EXCLUSIVE);
return (0);
- } else if (ret != EBUSY || (is_open && want_exclusive)) {
- if (ret == EBUSY)
- printf("busy, open and exclusive\n");
+ } else if (ret != EBUSY || (is_open && want_exclusive))
return (ret);
- } else
+ else
lock_busy = 1;
/* Give other threads a chance to make progress. */