diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java index 48ebc4f87071bae4cc39309ada8d90dfc5c64f5b..5ed1a6ed1e8e4d760666c3ff1da72a5bd64acbc5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java @@ -395,8 +395,15 @@ private void acquireLocks() throws CommandProcessorException { } } catch (Exception e) { - String errorMessage = "FAILED: Error in acquiring locks: " + e.getMessage(); - CONSOLE.printError(errorMessage, "\n" + StringUtils.stringifyException(e)); + String errorMessage; + if (driverState.isDestroyed() || driverState.isAborted() || driverState.isClosed()) { + errorMessage = String.format("Ignore lock acquisition related exception in terminal state (%s): %s", + driverState.toString(), e.getMessage()); + CONSOLE.printInfo(errorMessage); + } else { + errorMessage = String.format("FAILED: Error in acquiring locks: %s", e.getMessage()); + CONSOLE.printError(errorMessage, "\n" + StringUtils.stringifyException(e)); + } throw DriverUtils.createProcessorException(driverContext, 10, errorMessage, ErrorMsg.findSQLState(e.getMessage()), e); } finally {