Skip to content

Commit

Permalink
remove aws invalid backendgroup
Browse files Browse the repository at this point in the history
  • Loading branch information
tangbin committed Apr 22, 2020
1 parent e55bb82 commit 6747642
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
27 changes: 7 additions & 20 deletions pkg/compute/models/loadbalancerawscachedlbbg.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,25 +229,17 @@ func (man *SAwsCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.Cont
}
for i := 0; i < len(commondb); i++ {
var elb *SLoadbalancer
elbIds := commonext[i].GetLoadbalancerId()
if err != nil {
syncResult.UpdateError(err)
continue
}

elbId := commonext[i].GetLoadbalancerId()
if len(elbIds) > 0 {
if len(elbId) > 0 {
ielb, err := db.FetchByExternalId(LoadbalancerManager, elbId)
if err == nil {
elb = ielb.(*SLoadbalancer)
}
}

if elb == nil {
elb = &SLoadbalancer{}
elb.Id = ""
// elb.CloudregionId = region.GetId()
// elb.ManagerId = provider.GetId()
log.Debugf("Aws.SyncLoadbalancerBackendgroups skiped external backendgroup %s", elbId)
continue
}

err = commondb[i].SyncWithCloudLoadbalancerBackendgroup(ctx, userCred, elb, commonext[i], provider.GetOwnerId(), provider)
Expand All @@ -264,23 +256,18 @@ func (man *SAwsCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.Cont
for i := 0; i < len(added); i++ {
var elb *SLoadbalancer
elbId := added[i].GetLoadbalancerId()
if err != nil {
syncResult.AddError(err)
continue
}

if len(elbId) > 0 {
elb, err = LoadbalancerManager.FetchByExternalId(provider.GetId(), elbId)
if err != nil {
log.Debugf("awsCachedLbbgManager.SyncLoadbalancerBackendgroups %s", err)
syncResult.AddError(err)
continue
}
}

if elb == nil {
elb = &SLoadbalancer{}
elb.Id = ""
// elb.CloudregionId = region.GetId()
// elb.ManagerId = provider.GetId()
log.Debugf("Aws.SyncLoadbalancerBackendgroups skiped external backendgroup %s", elbId)
continue
}

new, err := man.newFromCloudLoadbalancerBackendgroup(ctx, userCred, elb, added[i], syncOwnerId, provider)
Expand Down
25 changes: 21 additions & 4 deletions pkg/compute/models/loadbalancerbackendgroups.go
Original file line number Diff line number Diff line change
Expand Up @@ -1019,13 +1019,30 @@ func (man *SLoadbalancerBackendGroupManager) initBackendGroupType() error {
return nil
}

/*func (man *SLoadbalancerBackendGroupManager) InitializeData() error {
if err := man.initBackendGroupType(); err != nil {
return err
func (man *SLoadbalancerBackendGroupManager) InitializeData() error {
q := man.Query().IsNullOrEmpty("loadbalancer_id")
lbbgs := make([]SLoadbalancerBackendGroup, 0)
err := db.FetchModelObjects(man, q, &lbbgs)
if err != nil {
return errors.Wrap(err, "SLoadbalancerBackendGroupManager.InitializeData")
}

for i := range lbbgs {
lbbg := lbbgs[i]
_, err = db.UpdateWithLock(context.Background(), &lbbg, func() error {
lbbg.MarkDelete()
return nil
})
if err != nil {
return errors.Wrap(err, "SLoadbalancerBackendGroupManager.InitializeData.MarkDelete")
}
}
return man.initBackendGroupRegion()

log.Debugf("SLoadbalancerBackendGroupManager.InitializeData removed %d invalid loadbalancer backendgroup.", len(lbbgs))
return nil
}

/*
func (manager *SLoadbalancerBackendGroupManager) initBackendGroupRegion() error {
groups := []SLoadbalancerBackendGroup{}
q := manager.Query()
Expand Down

0 comments on commit 6747642

Please sign in to comment.