close connection when binding space failed (#595)

* close connection when binding space failed * fix the close when auth failed
vesoft-inc · May 24, 2024 · 3d059c2 · 3d059c2
1 parent 06945e3
commit 3d059c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java b/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java
@@ -239,7 +239,7 @@ public String executeJson(String stmt)
     }
 
     public String executeJsonWithParameter(String stmt,
-                                                  Map<String, Object> parameterMap)
+                                           Map<String, Object> parameterMap)
             throws ClientServerIncompatibleException, AuthFailedException,
             IOErrorException, BindSpaceFailedException {
         stmtCheck(stmt);
@@ -412,13 +412,27 @@ private NebulaSession createSessionObject(SessionState state)
                     sessionPoolConfig.getPassword());
         } catch (AuthFailedException e) {
             log.error(e.getMessage());
-            close();
+            if (e.getMessage().toLowerCase().contains("user not exist")
+                    || e.getMessage().toLowerCase().contains("invalid password")) {
+                // close the session pool
+                close();
+            } else {
+                // just close the connection
+                connection.close();
+            }
             throw e;
         }
 
         NebulaSession nebulaSession = new NebulaSession(connection, authResult.getSessionId(),
                 authResult.getTimezoneOffset(), state);
-        ResultSet result = nebulaSession.execute(useSpace);
+        ResultSet result = null;
+        try {
+            result = nebulaSession.execute(useSpace);
+        } catch (IOErrorException e) {
+            log.error("binding space failed,", e);
+            nebulaSession.release();
+            throw new BindSpaceFailedException("binding space failed:" + e.getMessage());
+        }
         if (!result.isSucceeded()) {
             nebulaSession.release();
             throw new BindSpaceFailedException(result.getErrorMessage());

diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/net/SyncConnection.java b/client/src/main/java/com/vesoft/nebula/client/graph/net/SyncConnection.java
@@ -134,6 +134,7 @@ public void open(HostAddress address, int timeout,
                         Charsets.UTF_8));
             }
         } catch (TException e) {
+            close();
             throw new IOErrorException(IOErrorException.E_UNKNOWN, e.getMessage());
         }
     }