Skip to content

[SPARK-28247][SS][TEST]Fix flaky test "query without test harness" on ContinuousSuite #32316

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

Closed
zsxwing wants to merge 2 commits into from
Closed

[SPARK-28247][SS][TEST]Fix flaky test "query without test harness" on ContinuousSuite #32316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c053ae
fix
zsxwing Apr 23, 2021
144d198
fix for Scala 2.13
zsxwing Apr 24, 2021
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
22 changes: 13 additions & 9 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/continuous/ContinuousSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,31 @@ class ContinuousSuiteBase extends StreamTest {

protected def waitForRateSourceCommittedValue(
query: ContinuousExecution,
desiredValue: Long,
partitionIdToDesiredValue: Map[Int, Long],
maxWaitTimeMs: Long): Unit = {
def readHighestCommittedValue(c: ContinuousExecution): Option[Long] = {
def readCommittedValues(c: ContinuousExecution): Option[Map[Int, Long]] = {
c.committedOffsets.lastOption.map { case (_, offset) =>
offset match {
case o: RateStreamOffset =>
o.partitionToValueAndRunTimeMs.map {
case (_, ValueRunTimeMsPair(value, _)) => value
}.max
o.partitionToValueAndRunTimeMs.mapValues(_.value).toMap
}
}
}

def reachDesiredValues: Boolean = {
val committedValues = readCommittedValues(query).getOrElse(Map.empty)
partitionIdToDesiredValue.forall { case (key, value) =>
committedValues.contains(key) && committedValues(key) > value
}
}

val maxWait = System.currentTimeMillis() + maxWaitTimeMs
while (System.currentTimeMillis() < maxWait &&
readHighestCommittedValue(query).getOrElse(Long.MinValue) < desiredValue) {
while (System.currentTimeMillis() < maxWait && !reachDesiredValues) {
Thread.sleep(100)
}
if (System.currentTimeMillis() > maxWait) {
logWarning(s"Couldn't reach desired value in $maxWaitTimeMs milliseconds!" +
s"Current highest committed value is ${readHighestCommittedValue(query)}")
s"Current committed values is ${readCommittedValues(query)}")
}
}

Expand Down Expand Up @@ -264,7 +268,7 @@ class ContinuousSuite extends ContinuousSuiteBase {
val expected = Set(0, 1, 2, 3)
val continuousExecution =
query.asInstanceOf[StreamingQueryWrapper].streamingQuery.asInstanceOf[ContinuousExecution]
waitForRateSourceCommittedValue(continuousExecution, expected.max, 20 * 1000)
waitForRateSourceCommittedValue(continuousExecution, Map(0 -> 2, 1 -> 3), 20 * 1000)
query.stop()

val results = spark.read.table("noharness").collect()
Expand Down