[To rel/1.2] Keep special case consistent between LastDataQueryForOneDevice and others
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java index cb974af..360898c 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -895,7 +895,7 @@ if (enableRedirection && !deviceIdToEndpoint.isEmpty() && deviceIdToEndpoint.get(device) != null) { - logger.warn("Session can not connect to {}", deviceIdToEndpoint.get(device)); + logger.warn(SESSION_CANNOT_CONNECT, deviceIdToEndpoint.get(device)); deviceIdToEndpoint.remove(device); // reconnect with default connection
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java index 2db0fff..363351f 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
@@ -3093,6 +3093,10 @@ } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; + } catch (Throwable e) { + logger.error(EXECUTE_LASTDATAQUERY_ERROR, e); + putBack(session); + throw new RuntimeException(e); } } // never go here