Merge pull request #2 from xiongrenyi/dev2

improve DStreamSample's synchronization of C# and Java to let StreamingContext stop gracefully
microsoft · Nov 12, 2015 · 80f5ea0 · 80f5ea0
2 parents a44536e + 617a0fc
commit 80f5ea0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/csharp/Samples/Microsoft.Spark.CSharp/DStreamSamples.cs b/csharp/Samples/Microsoft.Spark.CSharp/DStreamSamples.cs
@@ -40,6 +40,7 @@ private static void StartFileServer(string directory, string pattern, int loop)
                     }
                     System.Threading.Thread.Sleep(200);
                 }
+
                 foreach (var file in Directory.GetFiles(testDir, "*"))
                     File.Delete(file);
             });
@@ -62,6 +63,10 @@ internal static void DStreamTextFileSamples()
 
             state.ForeachRDD((time, rdd) =>
             {
+                // there's chance rdd.Take conflicts with ssc.Stop
+                if (stopFileServer)
+                    return;
+
                 object[] taken = rdd.Take(10);
                 Console.WriteLine("-------------------------------------------");
                 Console.WriteLine("Time: {0}", time);
@@ -83,6 +88,9 @@ internal static void DStreamTextFileSamples()
                 System.Threading.Thread.Sleep(1000);
             }
 
+            // wait ForeachRDD to complete to let ssc.Stop() gracefully
+            System.Threading.Thread.Sleep(2000);
+
             ssc.Stop();
         }
     }