Return error when constructing cluster session failed (#112)

apache · Dec 11, 2024 · 8ed5752 · 8ed5752
1 parent 8fc3fd3
commit 8ed5752
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/client/session.go b/client/session.go
@@ -1147,12 +1147,12 @@ func newSessionWithSpecifiedSqlDialect(config *Config) Session {
 	return Session{config: config}
 }
 
-func NewClusterSession(clusterConfig *ClusterConfig) Session {
+func NewClusterSession(clusterConfig *ClusterConfig) (Session, error) {
 	clusterConfig.sqlDialect = TreeSqlDialect
 	return newClusterSessionWithSqlDialect(clusterConfig)
 }
 
-func newClusterSessionWithSqlDialect(clusterConfig *ClusterConfig) Session {
+func newClusterSessionWithSqlDialect(clusterConfig *ClusterConfig) (Session, error) {
 	session := Session{}
 	node := endPoint{}
 	for i := 0; i < len(clusterConfig.NodeUrls); i++ {
@@ -1180,9 +1180,9 @@ func newClusterSessionWithSqlDialect(clusterConfig *ClusterConfig) Session {
 		}
 	}
 	if !session.trans.IsOpen() {
-		log.Fatal("No Server Can Connect")
+		return session, fmt.Errorf("no server can connect")
 	}
-	return session
+	return session, nil
 }
 
 func (s *Session) initClusterConn(node endPoint) error {

diff --git a/client/sessionpool.go b/client/sessionpool.go
@@ -114,8 +114,11 @@ func (spool *SessionPool) getTableSession() (ITableSession, error) {
 
 func (spool *SessionPool) ConstructSession(config *PoolConfig) (session Session, err error) {
 	if len(config.NodeUrls) > 0 {
-		session = newClusterSessionWithSqlDialect(getClusterSessionConfig(config))
-		if err := session.OpenCluster(spool.enableCompression); err != nil {
+		session, err = newClusterSessionWithSqlDialect(getClusterSessionConfig(config))
+		if err != nil {
+			return session, err
+		}
+		if err = session.OpenCluster(spool.enableCompression); err != nil {
 			log.Print(err)
 			return session, err
 		}

diff --git a/client/tablesession.go b/client/tablesession.go
@@ -109,8 +109,11 @@ func NewTableSession(config *Config, enableRPCCompression bool, connectionTimeou
 //   - An error if there is an issue during session initialization.
 func NewClusterTableSession(clusterConfig *ClusterConfig, enableRPCCompression bool) (ITableSession, error) {
 	clusterConfig.sqlDialect = TableSqlDialect
-	session := newClusterSessionWithSqlDialect(clusterConfig)
-	if err := session.OpenCluster(enableRPCCompression); err != nil {
+	session, err := newClusterSessionWithSqlDialect(clusterConfig)
+	if err != nil {
+		return nil, err
+	}
+	if err = session.OpenCluster(enableRPCCompression); err != nil {
 		return nil, err
 	}
 	return &TableSession{session: session}, nil

diff --git a/example/session_example.go b/example/session_example.go
@@ -152,8 +152,11 @@ func connectCluster() {
 		UserName: "root",
 		Password: "root",
 	}
-	session = client.NewClusterSession(config)
-	if err := session.OpenCluster(false); err != nil {
+	session, err := client.NewClusterSession(config)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err = session.OpenCluster(false); err != nil {
 		log.Fatal(err)
 	}
 }

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -47,8 +47,10 @@ func (s *e2eTestSuite) SetupSuite() {
 		UserName: "root",
 		Password: "root",
 	}
-	s.session = client.NewClusterSession(&clusterConfig)
-	err := s.session.Open(false, 0)
+	session, err := client.NewClusterSession(&clusterConfig)
+	s.Require().NoError(err)
+	s.session = session
+	err = s.session.Open(false, 0)
 	s.Require().NoError(err)
 }