diff --git service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java index 04fc0a1..d9bfba87 100644 --- service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java @@ -398,9 +398,11 @@ private synchronized void cleanup(OperationState state) throws HiveSQLException Future backgroundHandle = getBackgroundHandle(); if (backgroundHandle != null) { boolean success = backgroundHandle.cancel(true); + String queryId = confOverlay.get(HiveConf.ConfVars.HIVEQUERYID.varname); if (success) { - String queryId = confOverlay.get(HiveConf.ConfVars.HIVEQUERYID.varname); LOG.info("The running operation has been successfully interrupted: " + queryId); + } else if (state == OperationState.CANCELED) { + LOG.info("The running operation could not be cancelled, typically because it has already completed normally: " + queryId); } } } @@ -427,8 +429,16 @@ private synchronized void cleanup(OperationState state) throws HiveSQLException @Override public void cancel(OperationState stateAfterCancel) throws HiveSQLException { + String queryId = null; + if (stateAfterCancel == OperationState.CANCELED) { + queryId = confOverlay.get(HiveConf.ConfVars.HIVEQUERYID.varname); + LOG.info("Cancelling the query execution: " + queryId); + } cleanup(stateAfterCancel); cleanupOperationLog(); + if (stateAfterCancel == OperationState.CANCELED) { + LOG.info("Successfully cancelled the query: " + queryId); + } } @Override