fix: delay concluding attempt in pushsync #2016
Merged
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
aloknerurkar
reviewed
Jun 7, 2021
pkg/pushsync/pushsync_test.go
Outdated
| if triggerCount < 9 { | ||
| triggerCount++ | ||
| stream.Close() | ||
| return errors.New("fmt") |
There was a problem hiding this comment.
Use a better error here.
aloknerurkar
approved these changes
Jun 7, 2021
acud
suggested changes
Jun 7, 2021
pkg/pushsync/pushsync.go
Outdated
| @@ -470,6 +461,15 @@ func (ps *PushSync) pushPeer(ctx context.Context, peer swarm.Address, ch swarm.C | |||
| return nil, true, err | |||
| } | |||
|
|
|||
| // if you manage to get a tag, just increment the respective counter | |||
| t, err := ps.tagger.Get(ch.TagID()) | |||
There was a problem hiding this comment.
this is not correct... you should increment the sent count once the chunk is sent.
There was a problem hiding this comment.
ok, it was a misunderstanding
pkg/pushsync/pushsync_test.go
Outdated
| @@ -488,7 +488,7 @@ func TestPushChunkToNextClosest(t *testing.T) { | |||
| if err != nil { | |||
| t.Fatal(err) | |||
| } | |||
| if ta2.Get(tags.StateSent) != 2 { | |||
There was a problem hiding this comment.
this seems a bit wrong no? why is this change needed?
mrekucci
reviewed
Jun 9, 2021
There was a problem hiding this comment.
Reviewable status: 0 of 3 files reviewed, 2 unresolved discussions (waiting on @acud and @metacertain)
pkg/pushsync/pushsync_test.go, line 944 at r3 (raw file):
triggerCount := 0 var lock sync.Mutex
Does this lock suppose to guard just the triggerCount variable? If so, I'd recommend to rename it to signal that those two are related.
istae
approved these changes
Jun 9, 2021
metacertain
force-pushed
the
push_attempt
branch
from
9c237ed
to
d4e17c8
Compare
acud
approved these changes
Jun 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 intends to make forwarder behavior ensure that chunk is successfully written to at least one further peer before concluding attempt has been made
This change is