opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.7.0 -> release/2.8.0

Browse Source 
* commit '332bf1e9e5bc9d0fd61236cee4b8fd4e941c26de':
  fix: try to sync disconnected account for every 24 hours
  fix: cloudaccount that is in stale syncing status should be auto-synced
This commit is contained in:
周有松
2019-03-10 15:34:26 +08:00
parent f7f7636f5b 332bf1e9e5
commit 4cb2e883a3
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+31 -8
View File
@@ -635,6 +635,7 @@ func (self *SCloudaccount) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.
}
}
extra.Add(projects, "projects")
extra.Set("sync_interval_seconds", jsonutils.NewInt(int64(self.getSyncIntervalSeconds())))
return extra
}
@@ -973,6 +974,26 @@ func (account *SCloudaccount) markAccountConnected(ctx context.Context, userCred
return account.SetStatus(userCred, CLOUD_PROVIDER_CONNECTED, "")
}
func (account *SCloudaccount) shouldProbeStatus() bool {
// connected state
if account.Status != CLOUD_PROVIDER_DISCONNECTED {
return true
}
// disconencted, but errorCount < threshold
if account.ErrorCount < options.Options.MaxCloudAccountErrorCount {
return true
}
// never synced
if account.LastSyncEndAt.IsZero() {
return true
}
// last sync is long time ago
if time.Now().Sub(account.LastSyncEndAt) > time.Duration(options.Options.DisconnectedCloudAccountRetryProbeIntervalHours)*time.Hour {
return true
}
return false
}
func (account *SCloudaccount) needSync() bool {
if account.LastSyncEndAt.IsZero() {
return true
@@ -992,13 +1013,15 @@ func (manager *SCloudaccountManager) AutoSyncCloudaccountTask(ctx context.Contex
}
q := manager.Query()
q = q.Filter(
sqlchemy.OR(
sqlchemy.NotEquals(q.Field("status"), CLOUD_PROVIDER_DISCONNECTED),
sqlchemy.LT(q.Field("error_count"), options.Options.MaxCloudAccountErrorCount),
),
)
q = q.Equals("sync_status", CLOUD_PROVIDER_SYNC_STATUS_IDLE)
/*
q = q.Filter(
sqlchemy.OR(
sqlchemy.NotEquals(q.Field("status"), CLOUD_PROVIDER_DISCONNECTED),
sqlchemy.LT(q.Field("error_count"), options.Options.MaxCloudAccountErrorCount),
),
)
*/
// q = q.Equals("sync_status", CLOUD_PROVIDER_SYNC_STATUS_IDLE)
accounts := make([]SCloudaccount, 0)
err := db.FetchModelObjects(manager, q, &accounts)
@@ -1008,7 +1031,7 @@ func (manager *SCloudaccountManager) AutoSyncCloudaccountTask(ctx context.Contex
}
for i := range accounts {
if accounts[i].needSync() {
if accounts[i].shouldProbeStatus() && accounts[i].needSync() && accounts[i].CanSync() {
accounts[i].SubmitSyncAccountTask(ctx, userCred, nil, true)
}
}
pkg/compute/options/options.go
+3 -1
View File
@@ -81,9 +81,11 @@ type ComputeOptions struct {
CloudSyncWorkerCount int `help:"how many current synchronization threads" default:"2"`
CloudAutoSyncIntervalSeconds int `help:"frequency to check auto sync tasks" default:"30"`
DefaultSyncIntervalSeconds int `help:"minimal synchronization interval, default 1 minutes" default:"900"`
MinimalSyncIntervalSeconds int `help:"minimal synchronization interval, default 1 minutes" default:"60"`
MinimalSyncIntervalSeconds int `help:"minimal synchronization interval, default 1 minutes" default:"300"`
MaxCloudAccountErrorCount int `help:"maximal consecutive error count allow for a cloud account" default:"5"`
DisconnectedCloudAccountRetryProbeIntervalHours int `help:"interval to wait to probe status of a disconnected cloud account" default:"24"`
cloudcommon.CommonOptions
cloudcommon.DBOptions
}