Skip to content

[SPARK-3971][SQL] Backport #2843 to branch-1.1 #3113

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
liancheng wants to merge 7 commits into from
Closed

[SPARK-3971][SQL] Backport #2843 to branch-1.1 #3113

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
faeca62
[SPARK-4037][SQL] Removes the SessionState instance created in HiveTh…
liancheng Nov 1, 2014
5928b39
[SPARK-3809][SQL] Fixes test suites in hive-thriftserver
liancheng Oct 13, 2014
0dd28ec
[SQL] Fixes the race condition that may cause test failure
liancheng Oct 16, 2014
7f395b7
[SQL] Fixes race condition in CliSuite
liancheng Nov 2, 2014
3202a36
[SQL] Decrease partitions when testing
marmbrus Sep 13, 2014
0c2a244
[SPARK-3646][SQL] Copy SQL configuration from SparkConf when a SQLCon…
marmbrus Sep 23, 2014
d354161
Provides Spark and Hive version in HiveThriftServer2 for branch-1.1
liancheng Nov 5, 2014
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
Prev Previous commit
Next Next commit
[SQL] Fixes the race condition that may cause test failure 
The removed `Future` was used to end the test case as soon as the Spark SQL CLI process exits. When the process exits prematurely, this mechanism prevents the test case to wait until timeout. But it also creates a race condition: when `foundAllExpectedAnswers.tryFailure` is called, there are chances that the last expected output line of the CLI process hasn't been caught by the main logics of the test code, thus fails the test case.

Removing this `Future` doesn't affect correctness.

Author: Cheng Lian <lian.cs.zju@gmail.com>

Closes #2823 from liancheng/clean-clisuite and squashes the following commits:

489a97c [Cheng Lian] Fixes the race condition that may cause test failure
  • Loading branch information
@liancheng
liancheng committed Nov 6, 2014
commit 0dd28ecda5755790912fa08625f3d7a649967a2a
6 changes: 0 additions & 6 deletions sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ class CliSuite extends FunSuite with BeforeAndAfterAll with Logging {
val process = (Process(command) #< queryStream).run(
ProcessLogger(captureOutput("stdout"), captureOutput("stderr")))

Future {
val exitValue = process.exitValue()
foundAllExpectedAnswers.tryFailure(
new SparkException(s"Spark SQL CLI process exit value: $exitValue"))
}

try {
Await.result(foundAllExpectedAnswers.future, timeout)
} catch { case cause: Throwable =>
Expand Down