[GitHub] spark pull request #15067: [SPARK-17513] [STREAMING] [SQL] Make StreamExecut...
Github user frreiss commented on a diff in the pull request:
https://github.com/apache/spark/pull/15067#discussion_r79662093
--- Diff:
sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQuerySuite.scala
---
@@ -125,6 +125,32 @@ class StreamingQuerySuite extends StreamTest with
BeforeAndAfter {
)
}
+ testQuietly("StreamExecution metadata garbarge collection") {
+val inputData = MemoryStream[Int]
+val mapped = inputData.toDS().map(6 / _)
+
+// Run a few batches through the application
+testStream(mapped)(
+ AddData(inputData, 1, 2),
+ CheckAnswer(6, 3),
+ AddData(inputData, 1, 2),
+ CheckAnswer(6, 3, 6, 3),
+ AddData(inputData, 4, 6),
+ CheckAnswer(6, 3, 6, 3, 1, 1),
+
+ // Three batches have run, but only one set of metadata should be
present
+ AssertOnQuery(
+q => {
+ val metadataLogDir = new
java.io.File(q.offsetLog.metadataPath.toString)
+ val logFileNames =
metadataLogDir.listFiles().toSeq.map(_.getName())
+ val toTest = logFileNames.filter(! _.endsWith(".crc")) //
Workaround for SPARK-17475
+ toTest.size == 1 && toTest.head == "2"
--- End diff --
Oops, didn't notice I had left that "true" at the end of that block of
code. @petermaxlee , let me know if you need help preparing the final version
for merge.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #15067: [SPARK-17513] [STREAMING] [SQL] Make StreamExecut...
Github user frreiss closed the pull request at: https://github.com/apache/spark/pull/15067 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #15067: [SPARK-17513] [STREAMING] [SQL] Make StreamExecut...
Github user petermaxlee commented on a diff in the pull request:
https://github.com/apache/spark/pull/15067#discussion_r79278249
--- Diff:
sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQuerySuite.scala
---
@@ -125,6 +125,32 @@ class StreamingQuerySuite extends StreamTest with
BeforeAndAfter {
)
}
+ testQuietly("StreamExecution metadata garbarge collection") {
+val inputData = MemoryStream[Int]
+val mapped = inputData.toDS().map(6 / _)
+
+// Run a few batches through the application
+testStream(mapped)(
+ AddData(inputData, 1, 2),
+ CheckAnswer(6, 3),
+ AddData(inputData, 1, 2),
+ CheckAnswer(6, 3, 6, 3),
+ AddData(inputData, 4, 6),
+ CheckAnswer(6, 3, 6, 3, 1, 1),
+
+ // Three batches have run, but only one set of metadata should be
present
+ AssertOnQuery(
+q => {
+ val metadataLogDir = new
java.io.File(q.offsetLog.metadataPath.toString)
+ val logFileNames =
metadataLogDir.listFiles().toSeq.map(_.getName())
+ val toTest = logFileNames.filter(! _.endsWith(".crc")) //
Workaround for SPARK-17475
+ toTest.size == 1 && toTest.head == "2"
--- End diff --
actually this test case will always pass, even without the change here. I
will submit a patch based on yours that fixes the issues here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #15067: [SPARK-17513] [STREAMING] [SQL] Make StreamExecut...
GitHub user frreiss opened a pull request: https://github.com/apache/spark/pull/15067 [SPARK-17513] [STREAMING] [SQL] Make StreamExecution garbage-collect its metadata ## What changes were proposed in this pull request? This PR modifies StreamExecution such that it discards metadata for batches that have already been fully processed. I used the `purge` method that was added as part of SPARK-17235. ## How was this patch tested? I added a test case to verify that old metadata log files are correctly purged. I also ran the entire regression suite. You can merge this pull request into a Git repository by running: $ git pull https://github.com/frreiss/spark-fred fred-16963a Alternatively you can review and apply these changes as the patch at: https://github.com/apache/spark/pull/15067.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #15067 commit 8cc5e835b209d5796b044978ec4221ee22a8b9d2 Author: frreiss Date: 2016-09-08T19:59:15Z Added purge() call to scheduler commit d71366d958334ebbc81e45c7f469bad2a68d0a2d Author: frreiss Date: 2016-09-10T04:23:58Z Added test case and corrected off-by-one error. commit 82f5b681c2e8e52f8549b21c7d058c497f2fc809 Author: frreiss Date: 2016-09-10T04:24:35Z Merge branch 'master' of https://github.com/apache/spark into fred-16963a --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
