SERVER-16502: create CollectionInfoCache on Collection construction

2 files changed, 14 insertions, 0 deletions

diff --git a/jstests/core/collection_info_cache_race.js b/jstests/core/collection_info_cache_race.js
new file mode 100644
index 00000000000..d32d38c0407
--- /dev/null
+++ b/jstests/core/collection_info_cache_race.js
@@ -0,0 +1,13 @@
+// Show case of initialized collection_info_cache crashing update
+
+// Create collection without an index, then try to save a doc.
+var coll = db.collection_info_cache_race;
+assert.commandWorked(db.createCollection(coll.getName(), {autoIndexId:false}));
+// Fails when SERVER-16502 was not fixed, due to invariant
+assert.writeOK(coll.save({_id:false}, {writeConcern:{w:1}}));
+
+
+coll.drop();
+assert.commandWorked(db.createCollection(coll.getName(), {autoIndexId:false}));
+assert.eq(null,coll.findOne());
+assert.writeOK(coll.save({_id:false}, {writeConcern:{w:1}}));
\ No newline at end of file
diff --git a/jstests/libs/parallelTester.js b/jstests/libs/parallelTester.js
index 56f7448bec7..d052b5024ea 100644
--- a/jstests/libs/parallelTester.js
+++ b/jstests/libs/parallelTester.js
@@ -152,6 +152,7 @@ if ( typeof _threadInject != "undefined" ){
                                    "geo_update_btree2.js", // SERVER-11132 test disables table scans
                                    "update_setOnInsert.js", // SERVER-9982
                                    "max_time_ms.js", // Sensitive to query execution time, by design
+                                   "collection_info_cache_race.js", // Requires collection exists
                                ] );
         
         var parallelFilesDir = "jstests/core";