opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19724 from ioito/automated-cherry-pick-of-#19723-upstream-release-3.11

Browse Source 
Automated cherry pick of #19723: fix(region): avoid duplicate zone name
This commit is contained in:
Zexi Li
2024-03-13 20:12:09 +08:00
committed by GitHub
parent bc478687a9 41db55345b
commit 87c8461960
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/zones.go
+6 -1
View File
@@ -356,7 +356,12 @@ func (self *SZone) syncWithCloudZone(ctx context.Context, userCred mcclient.Toke
}
diff, err := db.UpdateWithLock(ctx, self, func() error {
self.Name = extZone.GetName()
if options.Options.EnableSyncName {
newName, _ := db.GenerateAlterName(self, extZone.GetName())
if len(newName) > 0 && newName != self.Name {
self.Name = newName
}
}
self.Status = extZone.GetStatus()
self.IsEmulated = extZone.IsEmulated()