diff options
| author | Mathias Stearn <redbeard0531@gmail.com> | 2016-01-15 16:30:52 -0500 |
|---|---|---|
| committer | Mathias Stearn <redbeard0531@gmail.com> | 2016-01-18 13:33:40 -0500 |
| commit | c44a3ecdffd5c98fdd2daa6e46f52c50ff594576 (patch) | |
| tree | 4a04d9df845d94beba13abcde6b13a8ab6e0ba6d /src/mongo/db/catalog/cursor_manager.cpp | |
| parent | 930e47f1864d0319b7d9033ad2c2bf99f02014c1 (diff) | |
| download | mongo-c44a3ecdffd5c98fdd2daa6e46f52c50ff594576.tar.gz | |
SERVER-19128 Clean up interaction of background index builds and cursor killingr3.0.9-rc0
This reverts commit 90a684ad25a86deff16f80e11e257c6ac6611683, restoring
1d26b77d115eb39f03dffbdbaccf10e696cd4fe3.
Diffstat (limited to 'src/mongo/db/catalog/cursor_manager.cpp')
| -rw-r--r-- | src/mongo/db/catalog/cursor_manager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/db/catalog/cursor_manager.cpp b/src/mongo/db/catalog/cursor_manager.cpp index 6507b8fd1a5..d192d52ba25 100644 --- a/src/mongo/db/catalog/cursor_manager.cpp +++ b/src/mongo/db/catalog/cursor_manager.cpp @@ -34,6 +34,7 @@ #include "mongo/base/init.h" #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_session.h" +#include "mongo/db/background.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" #include "mongo/db/catalog/database_holder.h" @@ -313,6 +314,7 @@ CursorManager::~CursorManager() { void CursorManager::invalidateAll(bool collectionGoingAway) { SimpleMutex::scoped_lock lk(_mutex); + fassert(28819, !BackgroundOperation::inProgForNs(_nss)); for (ExecSet::iterator it = _nonCachedExecutors.begin(); it != _nonCachedExecutors.end(); ++it) { |