From d55429d4cddad650447e7d6733bbdc1be8d3ca06 Mon Sep 17 00:00:00 2001 From: TangBin Date: Sat, 10 Oct 2020 11:37:45 +0800 Subject: [PATCH] remove aws lbbg cache metedata --- pkg/compute/models/initdb.go | 1 + .../models/loadbalancerawscachedlbb.go | 4 +-- .../models/loadbalancerawscachedlbbg.go | 30 +++++++++++++++++-- .../models/loadbalancerhuaweicachedlbb.go | 4 +-- .../models/loadbalancerhuaweicachedlbbg.go | 2 -- .../models/loadbalancerqcloudcachedlbb.go | 4 +-- .../models/loadbalancerqcloudcachedlbbg.go | 2 -- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pkg/compute/models/initdb.go b/pkg/compute/models/initdb.go index 42f86c9f7b..20e40ceb04 100644 --- a/pkg/compute/models/initdb.go +++ b/pkg/compute/models/initdb.go @@ -52,6 +52,7 @@ func InitDB() error { LoadbalancerListenerRuleManager, LoadbalancerBackendGroupManager, LoadbalancerBackendManager, + AwsCachedLbbgManager, LoadbalancerClusterManager, SchedtagManager, DynamicschedtagManager, diff --git a/pkg/compute/models/loadbalancerawscachedlbb.go b/pkg/compute/models/loadbalancerawscachedlbb.go index 642ad4f190..2ef6d6c70d 100644 --- a/pkg/compute/models/loadbalancerawscachedlbb.go +++ b/pkg/compute/models/loadbalancerawscachedlbb.go @@ -159,16 +159,14 @@ func (man *SAwsCachedLbManager) SyncLoadbalancerBackends(ctx context.Context, us if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) syncResult.Update() } } for i := 0; i < len(added); i++ { - local, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) + _, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, local, added[i]) syncResult.Add() } } diff --git a/pkg/compute/models/loadbalancerawscachedlbbg.go b/pkg/compute/models/loadbalancerawscachedlbbg.go index a40a2b8a66..dcf30a0ce6 100644 --- a/pkg/compute/models/loadbalancerawscachedlbbg.go +++ b/pkg/compute/models/loadbalancerawscachedlbbg.go @@ -16,6 +16,7 @@ package models import ( "context" + "database/sql" "fmt" "strconv" "strings" @@ -249,7 +250,6 @@ func (man *SAwsCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.Cont if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) localLbgs = append(localLbgs, commondb[i]) remoteLbbgs = append(remoteLbbgs, commonext[i]) syncResult.Update() @@ -277,7 +277,6 @@ func (man *SAwsCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.Cont if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, new, added[i]) localLbgs = append(localLbgs, *new) remoteLbbgs = append(remoteLbbgs, added[i]) syncResult.Add() @@ -434,3 +433,30 @@ func (man *SAwsCachedLbbgManager) newFromCloudLoadbalancerBackendgroup(ctx conte db.OpsLog.LogEvent(lbbg, db.ACT_CREATE, lbbg.GetShortDesc(ctx), userCred) return lbbg, nil } + +func (man *SAwsCachedLbbgManager) InitializeData() error { + ret := []db.SMetadata{} + q := db.Metadata.Query().Equals("obj_type", man.Keyword()) + err := db.FetchModelObjects(db.Metadata, q, &ret) + if err != nil { + if errors.Cause(err) != sql.ErrNoRows { + log.Debugf("SAwsCachedLbbgManager.InitializeData %s", err) + } + + return nil + } + + for i := range ret { + item := ret[i] + _, err := db.Update(&item, func() error { + return item.MarkDelete() + }) + if err != nil { + log.Debugf("SAwsCachedLbbgManager.MarkDelete %s", err) + return nil + } + } + + log.Debugf("SAwsCachedLbbgManager cleaned %d dirty data.", len(ret)) + return nil +} diff --git a/pkg/compute/models/loadbalancerhuaweicachedlbb.go b/pkg/compute/models/loadbalancerhuaweicachedlbb.go index ba2ae3d219..f09933f84a 100644 --- a/pkg/compute/models/loadbalancerhuaweicachedlbb.go +++ b/pkg/compute/models/loadbalancerhuaweicachedlbb.go @@ -162,16 +162,14 @@ func (man *SHuaweiCachedLbManager) SyncLoadbalancerBackends(ctx context.Context, if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) syncResult.Update() } } for i := 0; i < len(added); i++ { - local, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) + _, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, local, added[i]) syncResult.Add() } } diff --git a/pkg/compute/models/loadbalancerhuaweicachedlbbg.go b/pkg/compute/models/loadbalancerhuaweicachedlbbg.go index 5d982216cf..258edc63f7 100644 --- a/pkg/compute/models/loadbalancerhuaweicachedlbbg.go +++ b/pkg/compute/models/loadbalancerhuaweicachedlbbg.go @@ -222,7 +222,6 @@ func (man *SHuaweiCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.C if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) localLbgs = append(localLbgs, commondb[i]) remoteLbbgs = append(remoteLbbgs, commonext[i]) syncResult.Update() @@ -233,7 +232,6 @@ func (man *SHuaweiCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.C if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, new, added[i]) localLbgs = append(localLbgs, *new) remoteLbbgs = append(remoteLbbgs, added[i]) syncResult.Add() diff --git a/pkg/compute/models/loadbalancerqcloudcachedlbb.go b/pkg/compute/models/loadbalancerqcloudcachedlbb.go index d4e2d7674e..4c90cffaa7 100644 --- a/pkg/compute/models/loadbalancerqcloudcachedlbb.go +++ b/pkg/compute/models/loadbalancerqcloudcachedlbb.go @@ -234,16 +234,14 @@ func (man *SQcloudCachedLbManager) SyncLoadbalancerBackends(ctx context.Context, if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) syncResult.Update() } } for i := 0; i < len(added); i++ { - local, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) + _, err := man.newFromCloudLoadbalancerBackend(ctx, userCred, loadbalancerBackendgroup, added[i], syncOwnerId) if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, local, added[i]) syncResult.Add() } } diff --git a/pkg/compute/models/loadbalancerqcloudcachedlbbg.go b/pkg/compute/models/loadbalancerqcloudcachedlbbg.go index 0301c90fcb..3b517bf2f7 100644 --- a/pkg/compute/models/loadbalancerqcloudcachedlbbg.go +++ b/pkg/compute/models/loadbalancerqcloudcachedlbbg.go @@ -294,7 +294,6 @@ func (man *SQcloudCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.C if err != nil { syncResult.UpdateError(err) } else { - syncMetadata(ctx, userCred, &commondb[i], commonext[i]) localLbgs = append(localLbgs, commondb[i]) remoteLbbgs = append(remoteLbbgs, commonext[i]) syncResult.Update() @@ -305,7 +304,6 @@ func (man *SQcloudCachedLbbgManager) SyncLoadbalancerBackendgroups(ctx context.C if err != nil { syncResult.AddError(err) } else { - syncMetadata(ctx, userCred, newlbbg, added[i]) localLbgs = append(localLbgs, *newlbbg) remoteLbbgs = append(remoteLbbgs, added[i]) syncResult.Add()