From 76527b7d4e7e2253e317cdf55963b871a6e2b923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 15 Apr 2019 11:22:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cloudaccounts.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 7a430d6f89..5faab94b05 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -63,6 +63,7 @@ type SCloudaccount struct { db.SEnabledStatusStandaloneResourceBase SSyncableBaseResource + LastAutoSync time.Time `list:"admin"` AccessUrl string `width:"64" charset:"ascii" nullable:"true" list:"admin" update:"admin" create:"admin_optional"` @@ -1198,6 +1199,18 @@ func (account *SCloudaccount) syncAccountStatus(ctx context.Context, userCred mc return nil } +func (account *SCloudaccount) markAutoSync(userCred mcclient.TokenCredential) error { + _, err := db.Update(account, func() error { + account.LastAutoSync = timeutils.UtcNow() + return nil + }) + if err != nil { + log.Errorf("Fail tp update last_auto_sync %v", err) + return err + } + return nil +} + func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCred mcclient.TokenCredential, waitChan chan error, autoSync bool) { RunSyncCloudAccountTask(func() { log.Debugf("syncAccountStatus %s %s", account.Id, account.Name) @@ -1211,6 +1224,7 @@ func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCre syncCnt := 0 if err == nil && autoSync && account.Enabled && account.EnableAutoSync { syncRange := SSyncRange{FullSync: true} + account.markAutoSync() providers := account.GetEnabledCloudproviders() for i := range providers { providers[i].syncCloudproviderRegions(ctx, userCred, syncRange, nil, autoSync) From d42d250674f3096eeba0d16a2c7c935e6c2fc654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 15 Apr 2019 12:28:36 +0800 Subject: [PATCH 2/2] typo --- pkg/compute/models/cloudaccounts.go | 14 +++++++------- pkg/compute/models/cloudproviderregions.go | 8 ++++---- pkg/compute/models/cloudproviders.go | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 5faab94b05..ebd9e16064 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -439,7 +439,7 @@ func (self *SCloudaccount) markStartSync(userCred mcclient.TokenCredential) erro return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markStartSync error: %v", err) return err } return nil @@ -453,7 +453,7 @@ func (self *SCloudaccount) MarkSyncing(userCred mcclient.TokenCredential) error return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to MarkSyncing error: %v", err) return err } return nil @@ -483,7 +483,7 @@ func (self *SCloudaccount) markEndSync(userCred mcclient.TokenCredential) error return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markEndSync error: %v", err) return err } return nil @@ -1098,7 +1098,7 @@ func (manager *SCloudaccountManager) AutoSyncCloudaccountTask(ctx context.Contex accounts := make([]SCloudaccount, 0) err := db.FetchModelObjects(manager, q, &accounts) if err != nil { - log.Errorf("fail to fetch cloudaccount list to check status") + log.Errorf("Failed to fetch cloudaccount list to check status") return } @@ -1150,7 +1150,7 @@ func (account *SCloudaccount) probeAccountStatus(ctx context.Context, userCred m return nil }) if err != nil { - log.Errorf("fail to update db %s", err) + log.Errorf("Failed to update db %s", err) } else { db.OpsLog.LogSyncUpdate(account, diff, userCred) } @@ -1205,7 +1205,7 @@ func (account *SCloudaccount) markAutoSync(userCred mcclient.TokenCredential) er return nil }) if err != nil { - log.Errorf("Fail tp update last_auto_sync %v", err) + log.Errorf("Failed to markAutoSync error: %v", err) return err } return nil @@ -1224,7 +1224,7 @@ func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCre syncCnt := 0 if err == nil && autoSync && account.Enabled && account.EnableAutoSync { syncRange := SSyncRange{FullSync: true} - account.markAutoSync() + account.markAutoSync(userCred) providers := account.GetEnabledCloudproviders() for i := range providers { providers[i].syncCloudproviderRegions(ctx, userCred, syncRange, nil, autoSync) diff --git a/pkg/compute/models/cloudproviderregions.go b/pkg/compute/models/cloudproviderregions.go index 703e3aa374..cceb45dedf 100644 --- a/pkg/compute/models/cloudproviderregions.go +++ b/pkg/compute/models/cloudproviderregions.go @@ -199,7 +199,7 @@ func (self *SCloudproviderregion) markStartSync(userCred mcclient.TokenCredentia return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markStartSync error: %v", err) return err } return nil @@ -213,7 +213,7 @@ func (self *SCloudproviderregion) markSyncing(userCred mcclient.TokenCredential) return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markSyncing error: %v", err) return err } return nil @@ -243,7 +243,7 @@ func (self *SCloudproviderregion) markEndSyncInternal(userCred mcclient.TokenCre return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markEndSyncInternal error: %v", err) return err } return nil @@ -275,7 +275,7 @@ func (self *SCloudproviderregion) DoSync(ctx context.Context, userCred mcclient. provider := self.GetProvider() driver, err := provider.GetProvider() if err != nil { - log.Errorf("fail to get driver, connection problem?") + log.Errorf("Failed to get driver, connection problem?") return err } diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index b8768974ec..3cf3289bd1 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -497,7 +497,7 @@ func (self *SCloudprovider) markStartSync(userCred mcclient.TokenCredential) err return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markStartSync error: %v", err) return err } return nil @@ -511,7 +511,7 @@ func (self *SCloudprovider) markSyncing(userCred mcclient.TokenCredential) error return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markSyncing error: %v", err) return err } return nil @@ -551,7 +551,7 @@ func (self *SCloudprovider) markEndSync(userCred mcclient.TokenCredential) error return nil }) if err != nil { - log.Errorf("Fail tp update last_sync %s", err) + log.Errorf("Failed to markEndSync error: %v", err) return err } return nil