Skip to content

Commit ff7853c

Browse files
authored
fix: check relations (#2145)
1 parent cc6c8a5 commit ff7853c

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

worker/appm/conversion/plugin.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,19 @@ func conversionServicePlugin(as *typesv1.AppService, dbmanager db.Manager) ([]v1
227227
var dependentComponents []healthy.DependentComponents
228228
services, err := db.GetManager().TenantServiceRelationDao().GetTenantServiceRelations(as.ServiceID)
229229
var dependServiceIDs []string
230+
relations, err := dbmanager.TenantServiceRelationDao().GetTenantServiceRelationsByDependServiceID(as.ServiceID)
231+
if err != nil {
232+
logrus.Errorf("GetTenantServiceRelationsByDependServiceID failure: %v", err)
233+
}
234+
relationServiceIDs := make(map[string]struct{})
235+
for _, relation := range relations {
236+
relationServiceIDs[relation.ServiceID] = struct{}{}
237+
}
230238
for _, service := range services {
239+
if _, exists := relationServiceIDs[service.DependServiceID]; exists {
240+
logrus.Infof("Skipping service with DependServiceID %v as it already exists in relations", service.DependServiceID)
241+
continue
242+
}
231243
dependServiceIDs = append(dependServiceIDs, service.DependServiceID)
232244
}
233245
servicePorts, err := db.GetManager().TenantServicesPortDao().ListInnerPortsByServiceIDs(dependServiceIDs)

0 commit comments

Comments
 (0)