Fixes for backup transfer #6027
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
link2xt
changed the title
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
2 times, most recently
from
bc15715 to
eda7140
Compare
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
3 times, most recently
from
7a77398 to
69fbf4b
Compare
|
There is a corresponding Android PR with progress bar fixes: deltachat/deltachat-android#3333 |
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
from
69fbf4b to
bb4d65e
Compare
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
from
5c20c6a to
9f4a329
Compare
Hocuri
reviewed
Oct 5, 2024
| ).race(async { | ||
| drop_token.cancelled().await; | ||
| Err(format_err!("Backup provider dropped")) | ||
| }).await { | ||
| warn!(context, "Error while handling backup connection: {err:#}."); |
There was a problem hiding this comment.
IIUC, if the transfer is cancelled during endpoint.accept(..), we do context.emit_event(EventType::ImexProgress(0)), and write nothing to the log.
If the transfer is cancelled during handle_connection(..), we write a message to the log, don't emit an event, and continue with the next iteration of the loop, (i.e. try to call endpoint.accept(..)) again. (this was fixed)
This seems surprising?
There was a problem hiding this comment.
Fixed by emitting progress 0. Cancellation during transfer is still logged as a warning unlike cancellation of accept loop, but it is just logging and not shown in the UI anyway.
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
from
fe912eb to
c9a9cd6
Compare
Hocuri
added a commit
to deltachat/deltachat-android
that referenced
this pull request
Oct 5, 2024
With deltachat/deltachat-core-rust#6027, when exporting a backup, the counter stays at 0% while running housekeeping and vacuuming the database, which takes 10 seconds on my device. Showing "One moment... 0%" for 10 seconds (or longer on slower devices / with bigger accounts) might make users think that it's not working and abort the process. So, instead, simply show "One moment..." until the progress reaches 1%.
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
from
c9a9cd6 to
582b379
Compare
Before this change progress bar only started when database is already transferred. Database is usually the largest file in the whole transfer, so the transfer appears to be stuck for the sender. With this change progress bar starts for backup export as soon as connection is received and counts bytes transferred over the connection using AsyncWrite wrapper. Similarly for backup import, AsyncRead wrapper counts the bytes received and emits progress events.
This is already documented in JSON-RPC API, but in fact ongoing process was not allocated.
link2xt
force-pushed
the
link2xt/imex-progress-events
branch
from
582b379 to
99a8a40
Compare
Hocuri
added a commit
to deltachat/deltachat-android
that referenced
this pull request
Oct 5, 2024
With deltachat/deltachat-core-rust#6027, when exporting a backup, the counter stays at 0% while running housekeeping and vacuuming the database, which takes 10 seconds on my device. Showing "One moment... 0%" for 10 seconds (or longer on slower devices / with bigger accounts) might make users think that it's not working and abort the process. So, instead, simply show "One moment..." until the progress reaches 1%.
link2xt
changed the title
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.
Closes #5993
fix: make it possible to cancel ongoing backup transfer
Before this change clicking "cancel" did not actually cancel the backup transfer if connection has already been established.
fix: smooth progress bar for backup transfer
Before this change progress bar only started
when database is already transferred.
Database is usually the largest file
in the whole transfer, so the transfer appears
to be stuck for the sender.
With this change progress bar
starts for backup export
as soon as connection is received
and counts bytes transferred over the connection
using AsyncWrite wrapper.
Similarly for backup import,
AsyncRead wrapper counts the bytes
received and emits progress events.
With this change Delta Chat desktop, from which I'm transferring, immediately shows the progress bar:
fix: make backup reception cancellable by stopping ongoing process
This is already documented in JSON-RPC API,
but in fact ongoing process was not allocated.
fix: emit progress 0 if get_backup() fails
Otherwise receiver gets stuck if the sender cancels backup transfer.