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): add provider info for sync log (#23933)

Browse Source
This commit is contained in:
屈轩
2025-12-15 13:47:31 +08:00
committed by GitHub
parent c6502eebd7
commit 4455a99645
3 changed files with 242 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudsync.go
+224 -202
View File
File diff suppressed because it is too large Load Diff
pkg/compute/models/cloudsyncelasticcache.go
+3 -3
View File
@@ -43,8 +43,8 @@ func syncElasticcaches(
return remoteRegion.GetIElasticcaches()
}()
if err != nil {
msg := fmt.Sprintf("GetIElasticcaches for region %s failed %s", remoteRegion.GetName(), err)
log.Errorf(msg)
msg := fmt.Sprintf("GetIElasticcaches for region %s provider %s failed %s", remoteRegion.GetName(), provider.Name, err)
log.Errorf("%s", msg)
return
}
@@ -56,7 +56,7 @@ func syncElasticcaches(
syncResults.Add(ElasticcacheManager, result)
msg := result.Result()
log.Infof("SyncElasticcaches for region %s result: %s", localRegion.Name, msg)
log.Infof("SyncElasticcaches for region %s provider %s result: %s", localRegion.Name, provider.Name, msg)
if result.IsError() {
return
}
pkg/compute/models/cloudsyncelb.go
+15 -15
View File
@@ -42,7 +42,7 @@ func syncRegionLoadbalancerCertificates(
return remoteRegion.GetILoadBalancerCertificates()
}()
if err != nil {
msg := fmt.Sprintf("GetILoadBalancerCertificates for region %s failed %s", remoteRegion.GetName(), err)
msg := fmt.Sprintf("GetILoadBalancerCertificates for region %s provider %s failed %s", remoteRegion.GetName(), provider.Name, err)
log.Errorln(msg)
return
}
@@ -54,7 +54,7 @@ func syncRegionLoadbalancerCertificates(
syncResults.Add(LoadbalancerCertificateManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancerCertificates for region %s result: %s", localRegion.Name, msg)
log.Infof("SyncLoadbalancerCertificates for region %s provider %s result: %s", localRegion.Name, provider.Name, msg)
if result.IsError() {
return
}
@@ -74,7 +74,7 @@ func syncRegionLoadbalancerAcls(
return remoteRegion.GetILoadBalancerAcls()
}()
if err != nil {
msg := fmt.Sprintf("GetILoadBalancerAcls for region %s failed %s", remoteRegion.GetName(), err)
msg := fmt.Sprintf("GetILoadBalancerAcls for region %s provider %s failed %s", remoteRegion.GetName(), provider.Name, err)
log.Errorln(msg)
return
}
@@ -86,7 +86,7 @@ func syncRegionLoadbalancerAcls(
syncResults.Add(LoadbalancerAclManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancerAcls for region %s result: %s", localRegion.Name, msg)
log.Infof("SyncLoadbalancerAcls for region %s provider %s result: %s", localRegion.Name, provider.Name, msg)
if result.IsError() {
return
}
@@ -106,7 +106,7 @@ func syncRegionLoadbalancers(
return remoteRegion.GetILoadBalancers()
}()
if err != nil {
msg := fmt.Sprintf("GetILoadBalancers for region %s failed %s", remoteRegion.GetName(), err)
msg := fmt.Sprintf("GetILoadBalancers for region %s provider %s failed %s", remoteRegion.GetName(), provider.Name, err)
log.Errorln(msg)
return
}
@@ -118,7 +118,7 @@ func syncRegionLoadbalancers(
syncResults.Add(LoadbalancerManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancers for region %s result: %s", localRegion.Name, msg)
log.Infof("SyncLoadbalancers for region %s provider %s result: %s", localRegion.Name, provider.Name, msg)
if result.IsError() {
return
}
@@ -138,20 +138,20 @@ func syncRegionLoadbalancers(
func syncLbPeripherals(ctx context.Context, userCred mcclient.TokenCredential, provider *SCloudprovider, local *SLoadbalancer, remote cloudprovider.ICloudLoadbalancer) {
err := syncLoadbalancerEip(ctx, userCred, provider, local, remote)
if err != nil {
log.Errorf("syncLoadbalancerEip error %s", err)
log.Errorf("syncLoadbalancerEips for loadbalancer %s provider %s error %s", local.Name, provider.Name, err)
}
err = syncLoadbalancerBackendgroups(ctx, userCred, SSyncResultSet{}, provider, local, remote)
if err != nil {
log.Errorf("syncLoadbalancerBackendgroups error: %v", err)
log.Errorf("syncLoadbalancerBackendgroups for loadbalancer %s provider %s error: %v", local.Name, provider.Name, err)
}
err = syncLoadbalancerListeners(ctx, userCred, SSyncResultSet{}, provider, local, remote)
if err != nil {
log.Errorf("syncLoadbalancerListeners error: %v", err)
log.Errorf("syncLoadbalancerListeners for loadbalancer %s provider %s error: %v", local.Name, provider.Name, err)
}
err = syncLoadbalancerSecurityGroups(ctx, userCred, local, remote)
if err != nil {
log.Errorf("syncLoadbalancerSecurityGroups error: %v", err)
log.Errorf("syncLoadbalancerSecurityGroups for loadbalancer %s provider %s error: %v", local.Name, provider.Name, err)
}
}
@@ -176,7 +176,7 @@ func syncLoadbalancerEip(ctx context.Context, userCred mcclient.TokenCredential,
}
result := localLb.SyncLoadbalancerEip(ctx, userCred, provider, eip)
msg := result.Result()
log.Infof("SyncEip for Loadbalancer %s result: %s", localLb.Name, msg)
log.Infof("SyncEips for Loadbalancer %s provider %s result: %s", localLb.Name, provider.Name, msg)
if result.IsError() {
return result.AllError()
}
@@ -193,7 +193,7 @@ func syncLoadbalancerListeners(ctx context.Context, userCred mcclient.TokenCrede
syncResults.Add(LoadbalancerListenerManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancerListeners for loadbalancer %s result: %s", localLoadbalancer.Name, msg)
log.Infof("SyncLoadbalancerListeners for loadbalancer %s provider %s result: %s", localLoadbalancer.Name, provider.Name, msg)
if result.IsError() {
return result.AllError()
}
@@ -211,7 +211,7 @@ func syncLoadbalancerListeners(ctx context.Context, userCred mcclient.TokenCrede
func syncLoadbalancerListenerRules(ctx context.Context, userCred mcclient.TokenCredential, syncResults SSyncResultSet, provider *SCloudprovider, localListener *SLoadbalancerListener, remoteListener cloudprovider.ICloudLoadbalancerListener) {
remoteRules, err := remoteListener.GetILoadbalancerListenerRules()
if err != nil {
msg := fmt.Sprintf("GetILoadbalancerListenerRules for listener %s failed %s", localListener.Name, err)
msg := fmt.Sprintf("GetILoadbalancerListenerRules for listener %s provider %s failed %s", localListener.Name, provider.Name, err)
log.Errorln(msg)
return
}
@@ -220,7 +220,7 @@ func syncLoadbalancerListenerRules(ctx context.Context, userCred mcclient.TokenC
syncResults.Add(LoadbalancerListenerRuleManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancerListenerRules for listener %s result: %s", localListener.Name, msg)
log.Infof("SyncLoadbalancerListenerRules for listener %s provider %s result: %s", localListener.Name, provider.Name, msg)
if result.IsError() {
return
}
@@ -235,7 +235,7 @@ func syncLoadbalancerBackendgroups(ctx context.Context, userCred mcclient.TokenC
syncResults.Add(LoadbalancerBackendGroupManager, result)
msg := result.Result()
log.Infof("SyncLoadbalancerBackendgroups for loadbalancer %s result: %s", local.Name, msg)
log.Infof("SyncLoadbalancerBackendgroups for loadbalancer %s provider %s result: %s", local.Name, provider.Name, msg)
if result.IsError() {
return result.AllError()
}