Make C++ driver call GLE after storing gridFS chunks, before calling filemd5. SERVER-6742

This ensures that there are no pending writebacks from the chunks being inserted.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/client/gridfs.cpp b/src/mongo/client/gridfs.cpp
index ddc2e12aeac..ff4939a8120 100644
--- a/src/mongo/client/gridfs.cpp
+++ b/src/mongo/client/gridfs.cpp
@@ -139,6 +139,12 @@ namespace mongo {
     }
 
     BSONObj GridFS::insertFile(const string& name, const OID& id, gridfs_offset length, const string& contentType) {
+        // Wait for any pending writebacks to finish
+        string err = _client.getLastError();
+        uassert( 16428,
+                 str::stream() << "Error storing GridFS chunk for file: " << name
+                               << ", error: " << err,
+                 err == "" );
 
         BSONObj res;
         if ( ! _client.runCommand( _dbName.c_str() , BSON( "filemd5" << id << "root" << _prefix ) , res ) )