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

Merge pull request #16825 from ioito/hotfix/qx-account-disconnect-reason

Browse Source 
fix(region): log with account disconnect reason
This commit is contained in:
Zexi Li
2023-04-20 13:24:17 +08:00
committed by GitHub
parent 00c4d251a4 d64fc69b22
commit e2c91e6f5e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+4 -5
View File
@@ -1343,8 +1343,7 @@ func migrateCloudprovider(cloudprovider *SCloudprovider) error {
secret, err := cloudprovider.getPassword()
if err != nil {
account.markAccountDisconected(context.Background(), auth.AdminCredential())
log.Errorf("Get password from provider %s error %v", cloudprovider.Name, err)
account.markAccountDisconected(context.Background(), auth.AdminCredential(), errors.Wrapf(err, "getPassword for provider %s", cloudprovider.Name).Error())
} else {
err = account.savePassword(secret)
if err != nil {
@@ -1817,7 +1816,7 @@ func (manager *SCloudaccountManager) OrderByExtraFields(
return q, nil
}
func (account *SCloudaccount) markAccountDisconected(ctx context.Context, userCred mcclient.TokenCredential) error {
func (account *SCloudaccount) markAccountDisconected(ctx context.Context, userCred mcclient.TokenCredential, reason string) error {
_, err := db.UpdateWithLock(ctx, account, func() error {
account.ErrorCount = account.ErrorCount + 1
account.HealthStatus = api.CLOUD_PROVIDER_HEALTH_UNKNOWN
@@ -1829,7 +1828,7 @@ func (account *SCloudaccount) markAccountDisconected(ctx context.Context, userCr
if account.Status == api.CLOUD_PROVIDER_CONNECTED {
account.EventNotify(ctx, userCred, notify.ActionSyncAccountStatus)
}
return account.SetStatus(userCred, api.CLOUD_PROVIDER_DISCONNECTED, "")
return account.SetStatus(userCred, api.CLOUD_PROVIDER_DISCONNECTED, reason)
}
func (account *SCloudaccount) markAllProvidersDisconnected(ctx context.Context, userCred mcclient.TokenCredential) error {
@@ -2103,7 +2102,7 @@ func (account *SCloudaccount) syncAccountStatus(ctx context.Context, userCred mc
subaccounts, err := account.probeAccountStatus(ctx, userCred)
if err != nil {
account.markAllProvidersDisconnected(ctx, userCred)
account.markAccountDisconected(ctx, userCred)
account.markAccountDisconected(ctx, userCred, errors.Wrapf(err, "probeAccountStatus").Error())
return errors.Wrap(err, "account.probeAccountStatus")
}
account.markAccountConnected(ctx, userCred)