Skip to content

[SPARK-22496][SQL] thrift server adds operation logs #19961

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
ChenjunZou wants to merge 1 commit into from
+14 −12
Closed

[SPARK-22496][SQL] thrift server adds operation logs #19961

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
[SPARK-22496][SQL] thrift server adds operation logs 
## What changes were proposed in this pull request?
since hive 2.0+  upgrades log4j to log4j2，a lot of [changes](https://issues.apache.org/jira/browse/HIVE-11304) are made working on it.
as spark is not to ready to update its inner hive version(1.2.1) , so I manage to make little changes.
the function registerCurrentOperationLog  is moved from SQLOperstion to its parent class ExecuteStatementOperation so spark can use it.

## How was this patch tested?
manual test

Author: zouchenjun <[email protected]>

Closes #19721 from ChenjunZou/operation-log.
  • Loading branch information
zouchenjun committed Dec 13, 2017
commit b39d36fba5ffbbcac6ba9c15b4062b7ade7b6f1e
13 changes: 13 additions & 0 deletions ...server/src/main/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.apache.hadoop.hive.ql.processors.CommandProcessor;
import org.apache.hadoop.hive.ql.processors.CommandProcessorFactory;
import org.apache.hadoop.hive.ql.session.OperationLog;
import org.apache.hive.service.cli.HiveSQLException;
import org.apache.hive.service.cli.OperationType;
import org.apache.hive.service.cli.session.HiveSession;
Expand Down Expand Up @@ -67,4 +68,16 @@ protected void setConfOverlay(Map<String, String> confOverlay) {
this.confOverlay = confOverlay;
}
}

protected void registerCurrentOperationLog() {
if (isOperationLogEnabled) {
if (operationLog == null) {
LOG.warn("Failed to get current OperationLog object of Operation: " +
getHandle().getHandleIdentifier());
Copy link
Member

@HyukjinKwon HyukjinKwon Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the indentation should be double spaced.

Copy link
Member

@gatorsmile gatorsmile Dec 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was resolved by me when I did the merge.

Copy link
Member

@HyukjinKwon HyukjinKwon Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @gatorsmile.

Copy link
Author

@ChenjunZou ChenjunZou Dec 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @gatorsmile @HyukjinKwon

isOperationLogEnabled = false;
return;
}
OperationLog.setCurrentOperationLog(operationLog);
}
}
}
12 changes: 0 additions & 12 deletions sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/SQLOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,18 +274,6 @@ private Hive getSessionHive() throws HiveSQLException {
}
}

private void registerCurrentOperationLog() {
if (isOperationLogEnabled) {
if (operationLog == null) {
LOG.warn("Failed to get current OperationLog object of Operation: " +
getHandle().getHandleIdentifier());
isOperationLogEnabled = false;
return;
}
OperationLog.setCurrentOperationLog(operationLog);
}
}

private void cleanup(OperationState state) throws HiveSQLException {
setState(state);
if (shouldRunAsync()) {
Expand Down
1 change: 1 addition & 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 @@ -170,6 +170,7 @@ private[hive] class SparkExecuteStatementOperation(
override def run(): Unit = {
val doAsAction = new PrivilegedExceptionAction[Unit]() {
override def run(): Unit = {
registerCurrentOperationLog()
try {
execute()
} catch {
Expand Down