This repository has been archived by the owner on Aug 2, 2021. It is now read-only.
chunk, pushsync: do not increment synced tags in pushsync #1880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nonsense
commented
Oct 16, 2019
| // set chunk status to synced, insert to db GC index | ||
| if err := p.store.Set(ctx, chunk.ModeSetSyncPush, syncedAddrs...); err != nil { | ||
| log.Error("pushsync: error setting chunks to synced", "err", err) | ||
| } | ||
|
|
||
| // delete from pushed items |
There was a problem hiding this comment.
Since we now increment synced tags in the localstore, we can only check if the root span is to be closed after we have performed the set operations.
nonsense
commented
Oct 16, 2019
| tag := item.tag | ||
| if tag != nil { | ||
| tag.Inc(chunk.StateSynced) |
There was a problem hiding this comment.
We no longer increment synced tags on receive of receipts, but we still close the spans for individual chunks as soon as we get a receipt.
kortatu
reviewed
Oct 16, 2019
pushsync/pusher.go
Outdated
Comment on lines
208
to
216
| if found { | ||
| tag := item.tag | ||
| if tag != nil { | ||
| if tag.Done(chunk.StateSynced) { | ||
| p.logger.Debug("closing root span for tag", "taguid", tag.Uid, "tagname", tag.Name) | ||
| tag.FinishRootSpan() | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This Pyramid of Doom can be simplified:
if found && item.tag != nil && item.tag.Done(chunk.StateSynced) {
tag := item.tag
p.logger.Debug("closing root span for tag", "taguid", tag.Uid, "tagname", tag.Name)
tag.FinishRootSpan()
} There was a problem hiding this comment.
Will fix, thanks! I have to see why the tests are failing, not sure if they are flaky, or the change to upload.go does indeed have an effect.
acud
approved these changes
Oct 16, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is updating the pushsync event loop to not increment tags for synced chunks on receive of receipts (as we are already doing that as part of the localstore mode set).