[SPARK-23000] [TEST] Keep Derby DB Location Unchanged After Session Cloning #20328
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cloud-fan
reviewed
Jan 19, 2018
| @@ -176,11 +176,16 @@ private[hive] class TestHiveSparkSession( | |||
| } | |||
|
|
|||
| { // set the metastore temporary configuration | |||
| val metastoreTempConf = HiveUtils.newTemporaryConfiguration(useInMemoryDerby = false) ++ Map( | |||
| var metastoreTempConf = HiveUtils.newTemporaryConfiguration(useInMemoryDerby = false) ++ Map( | |||
| ConfVars.METASTORE_INTEGER_JDO_PUSHDOWN.varname -> "true", | |||
| // scratch directory used by Hive's metastore client | |||
| ConfVars.SCRATCHDIR.varname -> TestHiveContext.makeScratchDir().toURI.toString, | |||
| ConfVars.METASTORE_CLIENT_CONNECT_RETRY_DELAY.varname -> "1") | |||
There was a problem hiding this comment.
nit:
... ++ existingSharedState.map { state =>
val connKey = state.sparkContext.hadoopConfiguration.get(ConfVars.METASTORECONNECTURLKEY.varname)
ConfVars.METASTORECONNECTURLKEY.varname -> connKey
}.getOrElse(Map.empty)
|
LGTM |
|
Test build #86382 has finished for PR 20328 at commit
|
|
retest this please |
|
Test build #86378 has finished for PR 20328 at commit
|
|
Test build #86381 has finished for PR 20328 at commit
|
|
Test build #86384 has finished for PR 20328 at commit
|
|
thanks, merging to master/2.3! |
asfgit
pushed a commit
that referenced
this pull request
Jan 19, 2018
…oning ## What changes were proposed in this pull request? After session cloning in `TestHive`, the conf of the singleton SparkContext for derby DB location is changed to a new directory. The new directory is created in `HiveUtils.newTemporaryConfiguration(useInMemoryDerby = false)`. This PR is to keep the conf value of `ConfVars.METASTORECONNECTURLKEY.varname` unchanged during the session clone. ## How was this patch tested? The issue can be reproduced by the command: > build/sbt -Phive "hive/test-only org.apache.spark.sql.hive.HiveSessionStateSuite org.apache.spark.sql.hive.DataSourceWithHiveMetastoreCatalogSuite" Also added a test case. Author: gatorsmile <[email protected]> Closes #20328 from gatorsmile/fixTestFailure. (cherry picked from commit 6c39654) Signed-off-by: Wenchen Fan <[email protected]>
|
An late LGTM! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
After session cloning in
TestHive, the conf of the singleton SparkContext for derby DB location is changed to a new directory. The new directory is created inHiveUtils.newTemporaryConfiguration(useInMemoryDerby = false).This PR is to keep the conf value of
ConfVars.METASTORECONNECTURLKEY.varnameunchanged during the session clone.How was this patch tested?
The issue can be reproduced by the command:
Also added a test case.