diff --git a/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java b/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java index fc409a8..389a2e4 100644 --- a/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java +++ b/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java @@ -794,10 +794,15 @@ public TGetOperationStatusResp GetOperationStatus(TGetOperationStatusReq req) th } JobProgressUpdate progressUpdate = operationStatus.jobProgressUpdate(); ProgressMonitorStatusMapper mapper = ProgressMonitorStatusMapper.DEFAULT; - if ("tez".equals(hiveConf.getVar(ConfVars.HIVE_EXECUTION_ENGINE))) { + String engineInSessionConf = cliService.getSessionManager().getOperationManager() + .getOperation(operationHandle) + .getParentSession() + .getHiveConf() + .getVar(ConfVars.HIVE_EXECUTION_ENGINE); + if ("tez".equals(engineInSessionConf)) { mapper = new TezProgressMonitorStatusMapper(); } - if ("spark".equals(hiveConf.getVar(ConfVars.HIVE_EXECUTION_ENGINE))) { + if ("spark".equals(engineInSessionConf)) { mapper = new SparkProgressMonitorStatusMapper(); } TJobExecutionStatus executionStatus =