Skip to content

[SPARK-21395][SQL] Spark SQL hive-thriftserver doesn't register operation log before execute sql statement #18649

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

[SPARK-21395][SQL] Spark SQL hive-thriftserver doesn't register operation log before execute sql statement #18649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5c963f
[SPARK-21395][SQL] Spark SQL hive-thriftserver doesn't register opera…
debugger87 Jul 16, 2017
fa4ba3d
fix scala code style
debugger87 Jul 17, 2017
542e427
Merge branch 'master' into master
debugger87 Aug 16, 2017
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
17 changes: 17 additions & 0 deletions ...rc/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import scala.collection.mutable.ArrayBuffer
import scala.util.control.NonFatal

import org.apache.hadoop.hive.metastore.api.FieldSchema
import org.apache.hadoop.hive.ql.session.OperationLog
import org.apache.hadoop.hive.shims.Utils
import org.apache.hive.service.cli._
import org.apache.hive.service.cli.operation.ExecuteStatementOperation
Expand Down Expand Up @@ -170,12 +171,15 @@ private[hive] class SparkExecuteStatementOperation(
override def run(): Unit = {
val doAsAction = new PrivilegedExceptionAction[Unit]() {
override def run(): Unit = {
registerCurrentOperationLog()
try {
execute()
} catch {
case e: HiveSQLException =>
setOperationException(e)
log.error("Error running hive query: ", e)
} finally {
unregisterOperationLog()
}
}
}
Expand Down Expand Up @@ -271,6 +275,19 @@ private[hive] class SparkExecuteStatementOperation(
HiveThriftServer2.listener.onStatementFinish(statementId)
}

private def registerCurrentOperationLog(): Unit = {
if (isOperationLogEnabled) {
if (operationLog == null) {
logWarning("Failed to get current OperationLog object of Operation: " +
getHandle().getHandleIdentifier())
isOperationLogEnabled = false
} else {
OperationLog.setCurrentOperationLog(operationLog)
}
}

}

override def cancel(): Unit = {
logInfo(s"Cancel '$statement' with $statementId")
cleanup(OperationState.CANCELED)
Expand Down
50 changes: 48 additions & 2 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 @@ -22,6 +22,7 @@ import java.net.URL
import java.nio.charset.StandardCharsets
import java.sql.{Date, DriverManager, SQLException, Statement}

import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.{ExecutionContext, Future, Promise}
Expand All @@ -33,9 +34,11 @@ import com.google.common.io.Files
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hive.jdbc.HiveDriver
import org.apache.hive.service.auth.PlainSaslHelper
import org.apache.hive.service.cli.{FetchOrientation, FetchType, GetInfoType}
import org.apache.hive.service.cli.GetInfoType
import org.apache.hive.service.cli.thrift.{ThriftCLIServiceClient, TProtocolVersion}
import org.apache.hive.service.cli.thrift.TCLIService.Client
import org.apache.hive.service.cli.thrift.ThriftCLIServiceClient
import org.apache.hive.service.cli.FetchOrientation
import org.apache.hive.service.cli.FetchType
import org.apache.thrift.protocol.TBinaryProtocol
import org.apache.thrift.transport.TSocket
import org.scalatest.BeforeAndAfterAll
Expand Down Expand Up @@ -597,6 +600,48 @@ class HiveThriftBinaryServerSuite extends HiveThriftJdbcTest {
bufferSrc.close()
}
}

test("SPARK-21395 registerCurrentOperationLog before execute sql statement") {
withCLIServiceClient { client =>
val user = System.getProperty("user.name")
val sessionHandle = client.openSession(user, "")

withJdbcStatement("test_21395") { statement =>
val queries = Seq(
"CREATE TABLE test_21395(key INT, val STRING)",
s"LOAD DATA LOCAL INPATH '${TestData.smallKv}' OVERWRITE INTO TABLE test_21395")
queries.foreach(statement.execute)

val confOverlay = new java.util.HashMap[java.lang.String, java.lang.String]
val operationHandle = client.executeStatementAsync(
sessionHandle,
"SELECT * FROM test_21395",
confOverlay)
assertResult(true, "Fetching OperationLog from HiveServer2") {
while (!client.getOperationStatus(operationHandle).getState().isTerminal()) {
Thread.sleep(3.seconds.toMillis)
}
val rows_next = client.fetchResults(
operationHandle,
FetchOrientation.FETCH_FIRST,
1000,
FetchType.LOG
)

val version = operationHandle.getProtocolVersion()
if (version.getValue() >= TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6.getValue()) {
val lines = rows_next.toTRowSet().getColumns().get(0)
.getStringVal().getValues().asScala
lines.exists(_.length > 0)
} else {
val lines = rows_next.toTRowSet().getRows().asScala
.map(_.getColVals().get(0).getStringVal().getValue)
lines.exists(_.length > 0)
}
}
}
}
}
}

class SingleSessionSuite extends HiveThriftJdbcTest {
Expand Down Expand Up @@ -825,6 +870,7 @@ abstract class HiveThriftServer2Test extends SparkFunSuite with BeforeAndAfterAl
| --hiveconf ${ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST}=localhost
| --hiveconf ${ConfVars.HIVE_SERVER2_TRANSPORT_MODE}=$mode
| --hiveconf ${ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LOG_LOCATION}=$operationLogPath
| --hiveconf ${ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL}=VERBOSE
| --hiveconf $portConf=$port
| --driver-class-path $driverClassPath
| --driver-java-options -Dlog4j.debug
Expand Down