Skip to content

Inconsistency between session Hive and thread-local Hive … #4189

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

Inconsistency between session Hive and thread-local Hive … #4189

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
6 changes: 1 addition & 5 deletions service/src/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 @@ -319,11 +319,7 @@ public void run() {
@Override
public Object run() throws HiveSQLException {
assert (!parentHive.allowClose());
try {
Hive.set(parentSessionState.getHiveDb());
} catch (HiveException e) {
throw new HiveSQLException(e);
}
Hive.set(parentHive);
// TODO: can this result in cross-thread reuse of session state?
SessionState.setCurrentSessionState(parentSessionState);
PerfLogger.setPerfLogger(SessionState.getPerfLogger());
Expand Down
18 changes: 13 additions & 5 deletions service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,11 @@ private synchronized void acquireAfterOpLock(boolean userAccess) {
// set the thread name with the logging prefix.
sessionState.updateThreadName();

try {
setSessionHive();
} catch (HiveSQLException e) {
throw new RuntimeException(e);
}
// If Hive.get() is being shared across different sessions,
// SessionState#getHiveDb() and Hive.get() may be different, in such case,
// the risk of deadlock on HiveMetaStoreClient#SynchronizedHandler can happen.
// Refresh the thread-local Hive to avoid the problem.
Hive.set(sessionHive);
}

/**
Expand All @@ -432,6 +432,14 @@ private synchronized void releaseBeforeOpLock(boolean userAccess) {
sessionState.resetThreadName();
}

// We have already set the thread-local Hive belonging to the current session,
// if the thread-local Hive has been changed after running the operation,
// the Hive after should belong to the same session, and we should update the sessionHive.
// The thread-local hive would be closed and recreated only when the underlying
// HiveMetaStoreClient is incompatible with the newest session conf.
if (Hive.getThreadLocal() != null && Hive.getThreadLocal() != sessionHive) {
sessionHive = Hive.getThreadLocal();
}
SessionState.detachSession();
if (ThreadWithGarbageCleanup.currentThread() instanceof ThreadWithGarbageCleanup) {
ThreadWithGarbageCleanup currentThread =
Expand Down