summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2016-02-08 16:38:18 -0500
committerMark Benvenuto <mark.benvenuto@mongodb.com>2016-02-08 16:38:18 -0500
commite0d4bac0dfdda2d3399e9188553b4db30297b84f (patch)
treeec4350a33978a71df4f19071cd1b66134e69a653
parent6a21f7390f4a8c08187697230fc6638daf6d54c4 (diff)
downloadmongo-e0d4bac0dfdda2d3399e9188553b4db30297b84f.tar.gz
TOOLS-1064 mongoimport alwasy returns 0 imported documents when compiled with gccgo
-rw-r--r--mongoimport/mongoimport.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/mongoimport/mongoimport.go b/mongoimport/mongoimport.go
index ef33efc6335..b2cac061e1a 100644
--- a/mongoimport/mongoimport.go
+++ b/mongoimport/mongoimport.go
@@ -349,7 +349,10 @@ func (imp *MongoImport) importDocuments(inputReader InputReader) (numImported ui
processingErrChan <- imp.ingestDocuments(readDocs)
}()
- return imp.insertionCount, channelQuorumError(processingErrChan, 2)
+ // expressions are evaluated from left to right so wait for the channels
+ // to complete before we read from imp.insertionCount
+ e1 := channelQuorumError(processingErrChan, 2)
+ return imp.insertionCount, e1
}
// ingestDocuments accepts a channel from which it reads documents to be inserted