fix: panic when instance is deleted

actiontech · Oct 16, 2024 · 230c55e · 230c55e
1 parent d9a3a74
commit 230c55e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/sqle/server/auditplan/task_type_mysql_processlist.go b/sqle/server/auditplan/task_type_mysql_processlist.go
@@ -77,10 +77,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, fmt.Errorf("instance: %v is not exist", ap.InstanceID)
+	}
 
 	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
@@ -47,10 +47,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, fmt.Errorf("instance: %v is not exist", ap.InstanceID)
+	}
 	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
@@ -95,10 +95,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, fmt.Errorf("instance: %v is not exist", ap.InstanceID)
+	}
 	// 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
@@ -41,10 +41,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 "", fmt.Errorf("instance: %v is not exist", node.InstanceID)
+		}
 		node.InstanceName = instance.Name
 	}