More fixes/clean up

Author: arramac

samples/documentdb-benchmark/App.config

@@ -7,7 +7,7 @@
     <gcServer enabled="true"/>
   </runtime>
   <appSettings>
-    <add key="EndPointUrl" value="https://FILLME.azure.com:443/"/>
+    <add key="EndPointUrl" value="https://FILLME.documents.azure.com:443/"/>
     <add key="AuthorizationKey" value="FILLME"/>
 
     <add key="DatabaseName" value="db"/>
@@ -18,7 +18,7 @@
     <add key="ShouldCleanupOnStart" value="false"/>
     <add key="ShouldCleanupOnFinish" value="false"/>
     <add key="DegreeOfParallelism" value="500"/>
-    <add key="NumberOfDocumentsToInsert" value="10000"/>
+    <add key="NumberOfDocumentsToInsert" value="100000"/>
 
     <add key="CollectionPartitionKey" value="/partitionKey"/>
     <add key="DocumentTemplateFile" value="Player.json"/>

samples/documentdb-benchmark/Program.cs

@@ -361,52 +361,56 @@ private DocumentCollection GetCollectionIfExists(string databaseName, string col
         public static async Task<V> ExecuteWithRetries<V>(DocumentClient client, Func<Task<V>> function, bool shouldLogRetries = false)
         {
             TimeSpan sleepTime = TimeSpan.Zero;
+            int[] expectedStatusCodes = new int[] { 429, 400, 503 };
 
             while (true)
             {
                 try
                 {
                     return await function();
                 }
-                catch (DocumentClientException de)
-                {
-                    if ((int)de.StatusCode != 429 && (int)de.StatusCode != 400 && (int)de.StatusCode != 503)
-                    {
-                        Trace.TraceError(de.ToString());
-                        throw de;
-                    }
-
-                    sleepTime = de.RetryAfter;
-                }
                 catch (System.Net.Http.HttpRequestException)
                 {
                     sleepTime = TimeSpan.FromSeconds(1);
                 }
-                catch (AggregateException ae)
+                catch (Exception e)
                 {
-                    if (!(ae.InnerException is DocumentClientException))
+                    DocumentClientException de;
+                    if (!TryExtractDocumentClientException(e, out de))
                     {
-                        Trace.TraceError(ae.ToString());
                         throw;
                     }
 
-                    DocumentClientException de = (DocumentClientException)ae.InnerException;
-                    if ((int)de.StatusCode != 429 && (int)de.StatusCode != 400 && (int)de.StatusCode != 503)
+                    sleepTime = de.RetryAfter;
+                    if (shouldLogRetries)
                     {
-                        Trace.TraceError(de.ToString());
-                        throw de;
+                        Console.WriteLine("Retrying after sleeping for {0}", sleepTime);
                     }
-
-                    sleepTime = de.RetryAfter;
                 }
 
-                if (shouldLogRetries)
+                await Task.Delay(sleepTime);
+            }
+        }
+
+        private static bool TryExtractDocumentClientException(Exception e, out DocumentClientException de)
+        {
+            if (e is DocumentClientException)
+            {
+                de = (DocumentClientException)e;
+                return true;
+            }
+
+            if (e is AggregateException)
+            {
+                if (e.InnerException is DocumentClientException)
                 {
-                    Console.WriteLine("Retrying after sleeping for {0}", sleepTime);
+                    de = (DocumentClientException)e.InnerException;
+                    return true;
                 }
-
-                await Task.Delay(sleepTime);
             }
+
+            de = null;
+            return false;
         }
     }
 }