diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java index 68ad024..8f45947 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java @@ -480,7 +480,7 @@ protected TezSessionPoolSession createSession(String sessionId) { */ private static boolean canWorkWithSameSession(TezSessionState session, HiveConf conf) throws HiveException { - if (session == null || conf == null) { + if (session == null || conf == null || !session.isOpen()) { return false; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java index 740e41b..2f521e3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java @@ -137,6 +137,9 @@ public int execute(DriverContext driverContext) { // Need to remove this static hack. But this is the way currently to get a session. SessionState ss = SessionState.get(); session = ss.getTezSession(); + if (session != null && !session.isOpen()) { + LOG.warn("The session: " + session + " has not been opened"); + } session = TezSessionPoolManager.getInstance().getSession( session, conf, false, getWork().getLlapMode()); ss.setTezSession(session); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java index 6f5aa54..2d1c687 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java @@ -65,6 +65,7 @@ public void open(HiveConf conf) throws IOException, LoginException, URISyntaxExc UserGroupInformation ugi = Utils.getUGI(); user = ugi.getShortUserName(); this.doAsEnabled = conf.getBoolVar(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS); + setOpen(true); } @Override -- 2.9.3 (Apple Git-75)