opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): skip disk sync by system tags (#15231)

Browse Source
This commit is contained in:
屈轩
2022-10-26 02:10:38 +08:00
committed by GitHub
parent 3fb8b7d879
commit 9dea6d2a7d
5 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+20 -4
View File
@@ -1476,17 +1476,33 @@ func (manager *SDiskManager) SyncDisks(ctx context.Context, userCred mcclient.To
}
for i := 0; i < len(commondb); i += 1 {
skip, key := IsNeedSkipSync(commonext[i])
if skip {
log.Infof("delete disk %s(%s) with tag key: %s", commonext[i].GetName(), commonext[i].GetGlobalId(), key)
err := commondb[i].purge(ctx, userCred)
if err != nil {
syncResult.DeleteError(err)
continue
}
syncResult.Delete()
continue
}
err = commondb[i].syncWithCloudDisk(ctx, userCred, provider, commonext[i], -1, syncOwnerId, storage.ManagerId)
if err != nil {
syncResult.UpdateError(err)
} else {
localDisks = append(localDisks, commondb[i])
remoteDisks = append(remoteDisks, commonext[i])
syncResult.Update()
continue
}
localDisks = append(localDisks, commondb[i])
remoteDisks = append(remoteDisks, commonext[i])
syncResult.Update()
}
for i := 0; i < len(added); i += 1 {
skip, key := IsNeedSkipSync(added[i])
if skip {
log.Infof("skip disk %s(%s) sync with tag key: %s", added[i].GetName(), added[i].GetGlobalId(), key)
continue
}
extId := added[i].GetGlobalId()
_disk, err := db.FetchByExternalIdAndManagerId(manager, extId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
sq := StorageManager.Query().SubQuery()
pkg/compute/models/hosts.go
+22 -22
View File
@@ -2433,6 +2433,26 @@ type SGuestSyncResult struct {
IsNew bool
}
func IsNeedSkipSync(ext cloudprovider.ICloudResource) (bool, string) {
if len(options.Options.SkipServerBySysTagKeys) == 0 && len(options.Options.SkipServerBySysTagKeys) == 0 {
return false, ""
}
keys := strings.Split(options.Options.SkipServerBySysTagKeys, ",")
for key := range ext.GetSysTags() {
if utils.IsInStringArray(key, keys) {
return true, key
}
}
userKeys := strings.Split(options.Options.SkipServerByUserTagKeys, ",")
tags, _ := ext.GetTags()
for key := range tags {
if utils.IsInStringArray(key, userKeys) {
return true, key
}
}
return false, ""
}
func (self *SHost) SyncHostVMs(ctx context.Context, userCred mcclient.TokenCredential, iprovider cloudprovider.ICloudProvider, vms []cloudprovider.ICloudVM, syncOwnerId mcclient.IIdentityProvider) ([]SGuestSyncResult, compare.SyncResult) {
lockman.LockRawObject(ctx, "guests", self.Id)
defer lockman.ReleaseRawObject(ctx, "guests", self.Id)
@@ -2464,26 +2484,6 @@ func (self *SHost) SyncHostVMs(ctx context.Context, userCred mcclient.TokenCrede
return nil, syncResult
}
skipFunc := func(ext cloudprovider.ICloudVM) (bool, string) {
if len(options.Options.SkipServerBySysTagKeys) == 0 && len(options.Options.SkipServerBySysTagKeys) == 0 {
return false, ""
}
keys := strings.Split(options.Options.SkipServerBySysTagKeys, ",")
for key := range ext.GetSysTags() {
if utils.IsInStringArray(key, keys) {
return true, key
}
}
userKeys := strings.Split(options.Options.SkipServerByUserTagKeys, ",")
tags, _ := ext.GetTags()
for key := range tags {
if utils.IsInStringArray(key, userKeys) {
return true, key
}
}
return false, ""
}
for i := 0; i < len(removed); i += 1 {
err := removed[i].syncRemoveCloudVM(ctx, userCred)
if err != nil {
@@ -2494,7 +2494,7 @@ func (self *SHost) SyncHostVMs(ctx context.Context, userCred mcclient.TokenCrede
}
for i := 0; i < len(commondb); i += 1 {
skip, key := skipFunc(commonext[i])
skip, key := IsNeedSkipSync(commonext[i])
if skip {
log.Infof("delete server %s(%s) with system tag key: %s", commonext[i].GetName(), commonext[i].GetGlobalId(), key)
err := commondb[i].purge(ctx, userCred)
@@ -2520,7 +2520,7 @@ func (self *SHost) SyncHostVMs(ctx context.Context, userCred mcclient.TokenCrede
}
for i := 0; i < len(added); i += 1 {
skip, key := skipFunc(added[i])
skip, key := IsNeedSkipSync(added[i])
if skip {
log.Infof("skip server %s(%s) sync with system tag key: %s", added[i].GetName(), added[i].GetGlobalId(), key)
continue
pkg/compute/options/options.go
+2 -2
View File
@@ -187,8 +187,8 @@ type ComputeOptions struct {
DefaultIPAllocationDirection string `help:"default IP allocation direction" default:"stepdown"`
// 弹性伸缩中的ecs一般会有特殊的系统标签，通过指定这些标签可以忽略这部分ecs的同步, 指定多个key需要以 ',' 分隔
SkipServerBySysTagKeys string `help:"skip server sync and create with system tags" default:"acs:autoscaling:scalingGroupId"`
SkipServerByUserTagKeys string `help:"skip server sync and create with user tags" default:""`
SkipServerBySysTagKeys string `help:"skip server,disk sync and create with system tags" default:"acs:autoscaling:scalingGroupId"`
SkipServerByUserTagKeys string `help:"skip server,disk sync and create with user tags" default:""`
EnableAwsMonitorAgent bool `help:"enable aws monitor agent" default:"true"`
pkg/multicloud/aliyun/storage.go
+2
View File
@@ -82,6 +82,8 @@ func (self *SStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
}
performanceLevel := ""
switch self.storageType {
case api.STORAGE_CLOUD_ESSD:
performanceLevel = "PL1"
case api.STORAGE_CLOUD_ESSD_PL2:
performanceLevel = "PL2"
case api.STORAGE_CLOUD_ESSD_PL3:
pkg/multicloud/tag_base.go
+3 -3
View File
@@ -141,8 +141,8 @@ func (self *AliyunTags) GetTags() (map[string]string, error) {
ret := map[string]string{}
for _, tag := range self.Tags.Tag {
if strings.HasPrefix(tag.TagKey, "aliyun") || strings.HasPrefix(tag.TagKey, "acs:") ||
strings.HasSuffix(tag.Key, "aliyun") || strings.HasPrefix(tag.Key, "acs:") ||
strings.HasSuffix(tag.Key, "ack.") { // k8s
strings.HasPrefix(tag.Key, "aliyun") || strings.HasPrefix(tag.Key, "acs:") ||
strings.HasPrefix(tag.Key, "ack.") || strings.HasPrefix(tag.TagKey, "ack.") { // k8s
continue
}
if len(tag.TagKey) > 0 {
@@ -160,7 +160,7 @@ func (self *AliyunTags) GetSysTags() map[string]string {
for _, tag := range self.Tags.Tag {
if strings.HasPrefix(tag.TagKey, "aliyun") || strings.HasPrefix(tag.TagKey, "acs:") ||
strings.HasPrefix(tag.Key, "aliyun") || strings.HasPrefix(tag.Key, "acs:") ||
strings.HasPrefix(tag.Key, "ack.") { // k8s
strings.HasPrefix(tag.Key, "ack.") || strings.HasPrefix(tag.TagKey, "ack.") { // k8s
if len(tag.TagKey) > 0 {
ret[tag.TagKey] = tag.TagValue
} else if len(tag.Key) > 0 {