summaryrefslogtreecommitdiff
path: root/s/chunk.cpp
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2011-08-23 08:47:18 +0200
committerAntonin Kral <a.kral@bobek.cz>2011-08-23 08:47:18 +0200
commita3bbc293c62e68425bdf6f8e983e2bfaa97ab06e (patch)
tree835c5b2f35a8ad1b46a49680524dfe884cae1d1b /s/chunk.cpp
parentbf8d466302e046d534b67751d012669f43bf672a (diff)
parentcbe2d992e9cd1ea66af9fa91df006106775d3073 (diff)
downloadmongodb-a3bbc293c62e68425bdf6f8e983e2bfaa97ab06e.tar.gz
Merge commit 'upstream/1.8.3'
Diffstat (limited to 's/chunk.cpp')
-rw-r--r--s/chunk.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/s/chunk.cpp b/s/chunk.cpp
index 1e473e2..2d0ad5d 100644
--- a/s/chunk.cpp
+++ b/s/chunk.cpp
@@ -749,7 +749,7 @@ namespace mongo {
FieldRange range = frs->range(_key.key().firstElement().fieldName());
if ( !range.nontrivial() ) {
DEV PRINT(range.nontrivial());
- getAllShards(shards);
+ getAllShards_inlock(shards);
return;
}
}
@@ -806,6 +806,10 @@ namespace mongo {
void ChunkManager::getAllShards( set<Shard>& all ) {
rwlock lk( _lock , false );
+ getAllShards_inlock( all );
+ }
+
+ void ChunkManager::getAllShards_inlock( set<Shard>& all ){
all.insert(_shards.begin(), _shards.end());
}