Skip to content

[SPARK-31626][SQL] Port HIVE-10415: hive.start.cleanup.scratchdir configuration is not taking effect #28436

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
wants to merge 1 commit into from
Closed

[SPARK-31626][SQL] Port HIVE-10415: hive.start.cleanup.scratchdir configuration is not taking effect #28436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...hriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package org.apache.spark.sql.hive.thriftserver
import java.util.Locale
import java.util.concurrent.atomic.AtomicBoolean

import org.apache.hadoop.hive.common.ServerUtils
import org.apache.hadoop.hive.conf.HiveConf
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService, ThriftHttpCLIService}
Expand Down Expand Up @@ -101,6 +102,8 @@ object HiveThriftServer2 extends Logging {
SparkSQLEnv.sqlContext.sessionState.newHadoopConf())

try {
// Cleanup the scratch dir before starting
ServerUtils.cleanUpScratchDir(executionHive.conf)
val server = new HiveThriftServer2(SparkSQLEnv.sqlContext)
server.init(executionHive.conf)
server.start()
Expand Down
33 changes: 33 additions & 0 deletions ...erver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,39 @@ class SingleSessionSuite extends HiveThriftJdbcTest {
}
}

class HiveThriftCleanUpScratchDirSuite extends HiveThriftJdbcTest{
var tempScratchDir: File = _

override protected def beforeAll(): Unit = {
tempScratchDir = Utils.createTempDir()
tempScratchDir.setWritable(true, false)
assert(tempScratchDir.list().isEmpty)
new File(tempScratchDir.getAbsolutePath + File.separator + "SPARK-31626").createNewFile()
assert(tempScratchDir.list().nonEmpty)
super.beforeAll()
}

override def mode: ServerMode.Value = ServerMode.binary

override protected def extraConf: Seq[String] =
s" --hiveconf ${ConfVars.HIVE_START_CLEANUP_SCRATCHDIR}=true " ::
s"--hiveconf ${ConfVars.SCRATCHDIR}=${tempScratchDir.getAbsolutePath}" :: Nil

test("Cleanup the Hive scratchdir when starting the Hive Server") {
assert(!tempScratchDir.exists())
withJdbcStatement() { statement =>
val rs = statement.executeQuery("SELECT id FROM range(1)")
assert(rs.next())
assert(rs.getLong(1) === 0L)
}
}

override protected def afterAll(): Unit = {
Utils.deleteRecursively(tempScratchDir)
super.afterAll()
}
}

class HiveThriftHttpServerSuite extends HiveThriftJdbcTest {
override def mode: ServerMode.Value = ServerMode.http

Expand Down