corrected issue with not setting MaxBatchCount in all cases. Also added MongoDefaults.MaxBatchCount.

Author: craiggwilson

MongoDB.Driver/CommandResults/IsMasterResult.cs

@@ -169,7 +169,7 @@ public int MinWireVersion
         /// </value>
         public int MaxWriteBatchSize
         {
-            get { return Response.GetValue("maxWriteBatchSize", 1000).ToInt32(); }
+            get { return Response.GetValue("maxWriteBatchSize", MongoDefaults.MaxBatchCount).ToInt32(); }
         }
 
         /// <summary>

MongoDB.Driver/Communication/MongoServerInstance.cs

@@ -74,6 +74,7 @@ internal MongoServerInstance(MongoServerSettings settings, MongoServerAddress ad
             _state = MongoServerState.Disconnected;
             _serverInfo = new ServerInformation
             {
+                MaxBatchCount = MongoDefaults.MaxBatchCount,
                 MaxDocumentSize = MongoDefaults.MaxDocumentSize,
                 MaxMessageLength = MongoDefaults.MaxMessageLength,
                 InstanceType = MongoServerInstanceType.Unknown
@@ -684,6 +685,7 @@ private void LookupServerInformation(MongoConnection connection)
                     IsPassive = isMasterResult.IsPassive,
                     IsPrimary = isMasterResult.IsPrimary,
                     IsSecondary = isMasterResult.IsSecondary,
+                    MaxBatchCount = isMasterResult.MaxWriteBatchSize,
                     MaxDocumentSize = isMasterResult.MaxBsonObjectSize,
                     MaxMessageLength = isMasterResult.MaxMessageLength,
                     ReplicaSetInformation = replicaSetInformation

MongoDB.Driver/MongoDefaults.cs

@@ -30,6 +30,7 @@ public static class MongoDefaults
         private static TimeSpan __connectTimeout = TimeSpan.FromSeconds(30);
         private static TimeSpan __maxConnectionIdleTime = TimeSpan.FromMinutes(10);
         private static TimeSpan __maxConnectionLifeTime = TimeSpan.FromMinutes(30);
+        private static int __maxBatchCount = 1000;
         private static int __maxConnectionPoolSize = 100;
         private static int __maxMessageLength = 16000000; // 16MB (not 16 MiB!)
         private static int __minConnectionPoolSize = 0;
@@ -102,6 +103,15 @@ public static GuidRepresentation GuidRepresentation
             set { BsonDefaults.GuidRepresentation = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the maximum batch count.
+        /// </summary>
+        public static int MaxBatchCount
+        {
+            get { return __maxBatchCount; }
+            set { __maxBatchCount = value; }
+        }
+
         /// <summary>
         /// Gets or sets the max connection idle time.
         /// </summary>