Repository navigation
lib/batcher: log when committing uploads has finished - fixes #5564 - #10057
Merged
Merged
Conversation
…5564 On shutdown the batcher logged "Committing uploads - please wait..." but nothing once the commit had completed, so the log looked as if rclone had stopped part way through. Log "Committing uploads - done" when the pending batches have been committed. This affects the backends which use the batcher, dropbox and googlephotos.
This file contains hidden or 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
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.
What does this change do?
When the batcher shuts down it logs
Committing uploads - please wait...and then nothing more, so the log looks as if rclone stopped part way through. As suggested in the issue, this adds a new message afterb.wg.Wait(), once the outstanding batches have been committed. The existing message is unchanged:lib/batcher, so the change covers both dropbox and googlephotos.The bisync test log filter drops the existing message, so I added the new one next to it. Without that, the bisync golden tests would fail on dropbox.
Testing
TestBatcherShutdownLogcommits an item to an async batcher and shuts it down. It checks that the new message is logged after the batch has been committed. It fails on master.go build ./...,make quicktest,go test ./lib/batcher/ ./cmd/bisync/,go test -race ./lib/batcher/,go vetandgolangci-lint run ./lib/batcher/... ./cmd/bisync/....test_allagainst them. The change is in the shared batcher and is covered by the test above.Linked issue
Fixes #5564
Checklist
test_allpasses for this backend. n/a, not a backend change.