Merge pull request #2688 from actiontech/fix_instance_not_existed

fix: panic when instance is deleted
actiontech · Oct 25, 2024 · 9742078 · 9742078
2 parents 08c4cd9 + 5710d6c
commit 9742078
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/sqle/server/auditplan/task_type_mysql_processlist.go b/sqle/server/auditplan/task_type_mysql_processlist.go
@@ -3,6 +3,7 @@ package auditplan
 import (
 	"context"
 	"fmt"
+	"github.com/actiontech/sqle/sqle/errors"
 	"strconv"
 	"time"
 
@@ -77,10 +78,13 @@ func (at *MySQLProcessListTaskV2) ExtractSQL(logger *logrus.Entry, ap *AuditPlan
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
 	defer cancel()
 
-	instance, _, err := dms.GetInstancesById(ctx, ap.InstanceID)
+	instance, exist, err := dms.GetInstancesById(ctx, ap.InstanceID)
 	if err != nil {
 		return nil, fmt.Errorf("get instance fail, error: %v", err)
 	}
+	if !exist {
+		return nil, errors.NewInstanceNoExistErr()
+	}
 
 	db, err := executor.NewExecutor(logger, &driverV2.DSN{
 		Host:             instance.Host,

diff --git a/sqle/server/auditplan/task_type_mysql_schema_meta.go b/sqle/server/auditplan/task_type_mysql_schema_meta.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/actiontech/sqle/sqle/errors"
 	"strconv"
 	"time"
 
@@ -47,10 +48,13 @@ func (at *BaseSchemaMetaTaskV2) extractSQL(logger *logrus.Entry, ap *AuditPlan,
 	sqls := []*SchemaMetaSQL{}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
 	defer cancel()
-	instance, _, err := dms.GetInstancesById(ctx, ap.InstanceID)
+	instance, exist, err := dms.GetInstancesById(ctx, ap.InstanceID)
 	if err != nil {
 		return nil, fmt.Errorf("get instance fail, error: %v", err)
 	}
+	if !exist {
+		return nil, errors.NewInstanceNoExistErr()
+	}
 	db, err := executor.NewExecutor(logger, &driverV2.DSN{
 		Host:             instance.Host,
 		Port:             instance.Port,

diff --git a/sqle/server/auditplan/task_type_oracle_topsql.go b/sqle/server/auditplan/task_type_oracle_topsql.go
@@ -3,6 +3,7 @@ package auditplan
 import (
 	"context"
 	"fmt"
+	"github.com/actiontech/sqle/sqle/errors"
 	"strconv"
 	"time"
 
@@ -95,10 +96,13 @@ func (at *OracleTopSQLTaskV2) ExtractSQL(logger *logrus.Entry, ap *AuditPlan, pe
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
 	defer cancel()
-	inst, _, err := dms.GetInstancesById(ctx, ap.InstanceID)
+	inst, exist, err := dms.GetInstancesById(ctx, ap.InstanceID)
 	if err != nil {
 		return nil, fmt.Errorf("get instance fail, error: %v", err)
 	}
+	if !exist {
+		return nil, errors.NewInstanceNoExistErr()
+	}
 	// This depends on: https://github.com/actiontech/sqle-oracle-plugin.
 	// If your Oracle db plugin does not implement the parameter `service_name`,
 	// you can only use the default service name `XE`.

diff --git a/sqle/server/pipeline/pipeline.go b/sqle/server/pipeline/pipeline.go
@@ -3,6 +3,7 @@ package pipeline
 import (
 	"context"
 	"fmt"
+	"github.com/actiontech/sqle/sqle/errors"
 	"net"
 	"net/url"
 	"time"
@@ -41,10 +42,13 @@ func (node PipelineNode) IntegrationInfo(ctx context.Context, projectName string
 		return "", err
 	}
 	if node.InstanceID != 0 {
-		instance, _, err := dms.GetInstancesById(context.TODO(), fmt.Sprint(node.InstanceID))
+		instance, exist, err := dms.GetInstancesById(context.TODO(), fmt.Sprint(node.InstanceID))
 		if err != nil {
 			return "", err
 		}
+		if !exist {
+			return "", errors.NewInstanceNoExistErr()
+		}
 		node.InstanceName = instance.Name
 	}