From 6b2667d4dc01be09ab8b54db08ab7645efc50b60 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 13 Mar 2023 12:58:37 +0100 Subject: [PATCH 1/3] Add increment/decrement logs --- commonspace/space.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commonspace/space.go b/commonspace/space.go index ece7437d..69277c5a 100644 --- a/commonspace/space.go +++ b/commonspace/space.go @@ -330,7 +330,7 @@ func (s *space) BuildTree(ctx context.Context, id string, opts BuildTreeOpts) (t if t, err = synctree.BuildSyncTreeOrGetRemote(ctx, id, deps); err != nil { return nil, err } - log.Debug("incrementing counter", zap.String("id", id), zap.String("spaceId", s.id)) + log.Debug("incrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()+1), zap.String("spaceId", s.id)) s.treesUsed.Add(1) return } @@ -406,7 +406,7 @@ func (s *space) handleMessage(msg HandleMessage) { } func (s *space) onObjectClose(id string) { - log.Debug("decrementing counter", zap.String("id", id), zap.String("spaceId", s.id)) + log.Debug("decrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()+1), zap.String("spaceId", s.id)) s.treesUsed.Add(-1) _ = s.handleQueue.CloseThread(id) } From a2efcafb3e191c6b3430108f4fa9c1857340ec17 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 13 Mar 2023 13:04:23 +0100 Subject: [PATCH 2/3] Update counters --- commonspace/space.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commonspace/space.go b/commonspace/space.go index 69277c5a..172de668 100644 --- a/commonspace/space.go +++ b/commonspace/space.go @@ -330,8 +330,8 @@ func (s *space) BuildTree(ctx context.Context, id string, opts BuildTreeOpts) (t if t, err = synctree.BuildSyncTreeOrGetRemote(ctx, id, deps); err != nil { return nil, err } - log.Debug("incrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()+1), zap.String("spaceId", s.id)) s.treesUsed.Add(1) + log.Debug("incrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()), zap.String("spaceId", s.id)) return } @@ -406,8 +406,8 @@ func (s *space) handleMessage(msg HandleMessage) { } func (s *space) onObjectClose(id string) { - log.Debug("decrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()+1), zap.String("spaceId", s.id)) s.treesUsed.Add(-1) + log.Debug("decrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()), zap.String("spaceId", s.id)) _ = s.handleQueue.CloseThread(id) } From 25b0695d3ee0278406378c67f31903e3ff3fe7bd Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 13 Mar 2023 13:46:36 +0100 Subject: [PATCH 3/3] Add counter for put sync tree --- commonspace/space.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/commonspace/space.go b/commonspace/space.go index 172de668..f6de90ea 100644 --- a/commonspace/space.go +++ b/commonspace/space.go @@ -295,7 +295,13 @@ func (s *space) PutTree(ctx context.Context, payload treestorage.TreeStorageCrea SyncStatus: s.syncStatus, PeerGetter: s.peerManager, } - return synctree.PutSyncTree(ctx, payload, deps) + t, err = synctree.PutSyncTree(ctx, payload, deps) + if err != nil { + return + } + s.treesUsed.Add(1) + log.Debug("incrementing counter", zap.String("id", payload.RootRawChange.Id), zap.Int32("trees", s.treesUsed.Load()), zap.String("spaceId", s.id)) + return } type BuildTreeOpts struct {