Skip to content

Merge Apache branch-1.5 and drop "candidate" from version #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbautin merged 18 commits into from
Sep 9, 2015
Merged

Merge Apache branch-1.5 and drop "candidate" from version #84

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f945b64
[SPARK-9869] [STREAMING] Wait for all event notifications before asse…
Sep 3, 2015
4d63335
[SPARK-10431] [CORE] Fix intermittent test failure. Wait for event qu…
Sep 3, 2015
09e08db
[SPARK-10454] [SPARK CORE] wait for empty event queue
Sep 4, 2015
dc39658
[SPARK-10311] [STREAMING] Reload appId and attemptId when app starts …
XuTingjun Sep 4, 2015
cfc5f6f
[SPARK-10402] [DOCS] [ML] Add defaults to the scaladoc for params in ml/
holdenk Sep 5, 2015
ec750a7
[SPARK-10440] [STREAMING] [DOCS] Update python API stuff in the progr…
tdas Sep 5, 2015
640000b
[SPARK-10434] [SQL] Fixes Parquet schema of arrays that may contain null
liancheng Sep 5, 2015
37c5edf
[DOC] Added R to the list of languages with "high-level API" support …
Sep 8, 2015
88a07d8
Docs small fixes
jaceklaskowski Sep 8, 2015
c3da154
Merge branch 'branch-1.5' of github.com:apache/spark into csd-1.5
markhamstra Sep 8, 2015
34d417e
[SPARK-10470] [ML] ml.IsotonicRegressionModel.copy should set parent
yanboliang Sep 8, 2015
7fd4674
[SPARK-10441] [SQL] [BRANCH-1.5] Save data correctly to json.
yhuai Sep 8, 2015
5b038e0
Merge branch 'branch-1.5' of github.com:apache/spark into csd-1.5
markhamstra Sep 8, 2015
f8c4b65
removed "candidate" from version
markhamstra Sep 8, 2015
63c72b9
[SPARK-10492] [STREAMING] [DOCUMENTATION] Update Streaming documentat…
tdas Sep 8, 2015
fca16c5
[SPARK-10301] [SPARK-10428] [SQL] [BRANCH-1.5] Fixes schema merging f…
liancheng Sep 9, 2015
d4b00c5
[SPARK-10071] [STREAMING] Output a warning when writing QueueInputDSt…
zsxwing Sep 9, 2015
77e93c1
Merge branch 'branch-1.5' of github.com:apache/spark into csd-1.5
markhamstra Sep 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[SPARK-9869] [STREAMING] Wait for all event notifications before asse… 
…rting results

Author: robbins <[email protected]>

Closes apache#8589 from robbinspg/InputStreamSuite-fix.

(cherry picked from commit 754f853)
Signed-off-by: Andrew Or <[email protected]>
  • Loading branch information
robbins authored and Andrew Or committed Sep 3, 2015
commit f945b641c70790a82c864ec752b673b89bb4310f
3 changes: 3 additions & 0 deletions streaming/src/test/scala/org/apache/spark/streaming/InputStreamsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ class InputStreamsSuite extends TestSuiteBase with BeforeAndAfter {
fail("Timeout: cannot finish all batches in 30 seconds")
}

// Ensure progress listener has been notified of all events
ssc.scheduler.listenerBus.waitUntilEmpty(500)

// Verify all "InputInfo"s have been reported
assert(ssc.progressListener.numTotalReceivedRecords === input.size)
assert(ssc.progressListener.numTotalProcessedRecords === input.size)
Expand Down