This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 63b862bef9 [To rel/0.13] [IOTDB-3797] Print detailed info when failed
opening session (#6766)
63b862bef9 is described below
commit 63b862bef945c133225e5c499cc7a6e0144373e0
Author: Mrquan <[email protected]>
AuthorDate: Tue Jul 26 14:07:08 2022 +0800
[To rel/0.13] [IOTDB-3797] Print detailed info when failed opening session
(#6766)
---
cli/src/test/java/org/apache/iotdb/cli/AbstractScript.java | 5 -----
.../java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java | 8 ++++----
.../java/org/apache/iotdb/tool/integration/ImportCsvTestIT.java | 8 ++++----
.../src/main/java/org/apache/iotdb/session/SessionConnection.java | 8 ++++++--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/cli/src/test/java/org/apache/iotdb/cli/AbstractScript.java
b/cli/src/test/java/org/apache/iotdb/cli/AbstractScript.java
index 1172179106..d1af4f4493 100644
--- a/cli/src/test/java/org/apache/iotdb/cli/AbstractScript.java
+++ b/cli/src/test/java/org/apache/iotdb/cli/AbstractScript.java
@@ -46,11 +46,6 @@ public abstract class AbstractScript {
if (line == null) {
break;
} else {
- // remove thing after "connection refused", only for test
- if (line.contains("Connection refused")) {
- line =
- line.substring(0, line.indexOf("Connection refused") +
"Connection refused".length());
- }
outputList.add(line);
}
}
diff --git
a/cli/src/test/java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java
b/cli/src/test/java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java
index f0cfb17cb9..2b6ac06702 100644
--- a/cli/src/test/java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java
+++ b/cli/src/test/java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java
@@ -51,8 +51,8 @@ public class ExportCsvTestIT extends AbstractScript {
"````````````````````````````````````````````````",
"Starting IoTDB Client Export Script",
"````````````````````````````````````````````````",
- "Connect failed because org.apache.thrift.transport.TTransportException:
"
- + "java.net.ConnectException: Connection refused"
+ "Connect failed because Fail to reconnect to server. "
+ + "Please check server status.127.0.0.1:6668"
};
String dir = getCliPath();
ProcessBuilder builder =
@@ -82,8 +82,8 @@ public class ExportCsvTestIT extends AbstractScript {
"------------------------------------------",
"Starting IoTDB Client Export Script",
"------------------------------------------",
- "Connect failed because org.apache.thrift.transport.TTransportException:
"
- + "java.net.ConnectException: Connection refused"
+ "Connect failed because Fail to reconnect to server. "
+ + "Please check server status.127.0.0.1:6668"
};
String dir = getCliPath();
ProcessBuilder builder =
diff --git
a/cli/src/test/java/org/apache/iotdb/tool/integration/ImportCsvTestIT.java
b/cli/src/test/java/org/apache/iotdb/tool/integration/ImportCsvTestIT.java
index aea5ce82a8..e77761a661 100644
--- a/cli/src/test/java/org/apache/iotdb/tool/integration/ImportCsvTestIT.java
+++ b/cli/src/test/java/org/apache/iotdb/tool/integration/ImportCsvTestIT.java
@@ -51,8 +51,8 @@ public class ImportCsvTestIT extends AbstractScript {
"````````````````````````````````````````````````",
"Starting IoTDB Client Import Script",
"````````````````````````````````````````````````",
- "Encounter an error when connecting to server, because
org.apache.thrift.transport.TTransportException: "
- + "java.net.ConnectException: Connection refused"
+ "Encounter an error when connecting to server, because Fail to reconnect
to server. "
+ + "Please check server status.127.0.0.1:6668"
};
String dir = getCliPath();
ProcessBuilder builder =
@@ -82,8 +82,8 @@ public class ImportCsvTestIT extends AbstractScript {
"------------------------------------------",
"Starting IoTDB Client Import Script",
"------------------------------------------",
- "Encounter an error when connecting to server, because
org.apache.thrift.transport.TTransportException: "
- + "java.net.ConnectException: Connection refused"
+ "Encounter an error when connecting to server, because Fail to reconnect
to server. "
+ + "Please check server status.127.0.0.1:6668"
};
String dir = getCliPath();
ProcessBuilder builder =
diff --git
a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 1ef37cd771..5bfe101e69 100644
--- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -97,7 +97,11 @@ public class SessionConnection {
this.endPoint = endPoint;
endPointList.add(endPoint);
this.zoneId = zoneId == null ? ZoneId.systemDefault() : zoneId;
- init(endPoint);
+ try {
+ init(endPoint);
+ } catch (IoTDBConnectionException e) {
+ throw new IoTDBConnectionException(logForReconnectionFailure());
+ }
}
public SessionConnection(Session session, ZoneId zoneId) throws
IoTDBConnectionException {
@@ -170,7 +174,7 @@ public class SessionConnection {
} catch (IoTDBConnectionException e) {
if (!reconnect()) {
logger.error("Cluster has no nodes to connect");
- throw new IoTDBConnectionException(e);
+ throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
break;
