[servicecomb-service-center] branch master updated: #1228 update accout failed, make panic

[robotljw]

This is an automated email from the ASF dual-hosted git repository.

robotljw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e438b0  #1228 update accout failed, make panic
     new cc1a0b4  Merge pull request #1256 from aseTo2016/master
9e438b0 is described below

commit 9e438b0a9ef64cfe85f05521a251fdadf5d0ed92
Author: aseTo2016 <tys201193111>
AuthorDate: Thu Feb 10 16:13:08 2022 +0800

    #1228 update accout failed, make panic
---
 syncer/service/replicator/resource/account.go | 1 +
 syncer/service/task/manager.go                | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/syncer/service/replicator/resource/account.go 
b/syncer/service/replicator/resource/account.go
index a36bfcd..a0c6ee2 100644
--- a/syncer/service/replicator/resource/account.go
+++ b/syncer/service/replicator/resource/account.go
@@ -85,6 +85,7 @@ func (a *account) NeedOperate(ctx context.Context) *Result {
                },
                resourceID: a.input.Name,
        }
+       c.tombstoneLoader = c
        return c.needOperate(ctx)
 }
 
diff --git a/syncer/service/task/manager.go b/syncer/service/task/manager.go
index e03e7bc..52fb7b6 100644
--- a/syncer/service/task/manager.go
+++ b/syncer/service/task/manager.go
@@ -164,6 +164,8 @@ func (m *manager) ListTasks(ctx context.Context) 
([]*carisync.Task, error) {
                return nil, err
        }
 
+       metrics.PendingTaskSet(int64(len(tasks)))
+
        noHandleTasks := make([]*carisync.Task, 0, len(tasks))
        skipTaskIDs := make([]string, 0, len(tasks))
        for _, t := range tasks {
@@ -258,8 +260,6 @@ func (m *manager) handleResult(res *event.Result) {
 func (m *manager) handleTasks(sts syncTasks) {
        sort.Sort(sts)
 
-       metrics.PendingTaskSet(int64(len(sts)))
-
        for _, st := range sts {
                m.eventSender.Send(toEvent(st, m.result))
        }