summaryrefslogtreecommitdiff
path: root/src/mongo/db/d_concurrency.h
diff options
context:
space:
mode:
authorDwight <dwight@10gen.com>2012-02-29 16:40:17 -0500
committerDwight <dwight@10gen.com>2012-02-29 16:40:17 -0500
commit887c244b4e8a5d8d9c98a84442583f95b78a7159 (patch)
tree0022f58280a4558bafe212460c1de51a29771fe9 /src/mongo/db/d_concurrency.h
parent968e5e46af4f1f8a7e102b640554cb0f9698cb18 (diff)
downloadmongo-887c244b4e8a5d8d9c98a84442583f95b78a7159.tar.gz
SERVER-4328 we upgrade the qlock from R to W during commits so we can REMAPPRIVATEVIEW. unforutnately this can deadlock with groupCommitMutex. thus this change to timeout the upgrade. this is not a very good fix if the timeouts manifest; there is logging when they do so we should notice.
Diffstat (limited to 'src/mongo/db/d_concurrency.h')
-rw-r--r--src/mongo/db/d_concurrency.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
index 25df6e456fd..6ba046cc975 100644
--- a/src/mongo/db/d_concurrency.h
+++ b/src/mongo/db/d_concurrency.h
@@ -37,7 +37,7 @@ namespace mongo {
GlobalWrite(bool stopGreed = false);
~GlobalWrite();
void downgrade(); // W -> R
- void upgrade(); // caution see notes
+ bool upgrade(); // caution see notes
};
struct GlobalRead : boost::noncopyable { // recursive is ok
GlobalRead();