Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wait for download completion when downloading fresh FLX realm in client reset #5805

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Wait for download completion when downloading fresh FLX realm in client reset #5805

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
768958e
Wait for download completion when downloading fresh FLX realm in clie…
jbreams Aug 31, 2022
3938a09
changelog
jbreams Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/realm/object-store/sync/sync_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,28 @@ void SyncSession::download_fresh_realm(sync::ProtocolErrorInfo::Action server_re
std::move(fresh_mut_sub)
.commit()
.get_state_change_notification(sync::SubscriptionSet::State::Complete)
.get_async([=, weak_self = weak_from_this()](StatusWith<sync::SubscriptionSet::State> s) {
.then([=, weak_self = weak_from_this()](sync::SubscriptionSet::State) {
auto pf = util::make_promise_future<void>();
sync_session->wait_for_download_completion([=, promise = std::move(pf.promise)](
std::error_code ec) mutable {
auto strong_self = weak_self.lock();
if (!strong_self) {
return promise.set_error({ErrorCodes::RuntimeError,
"SyncSession was destroyed before download could be completed"});
}

if (ec) {
return promise.set_error(
{ErrorCodes::RuntimeError,
util::format("Error waiting for download completion for fresh realm (code: %1): %2",
ec.value(), ec.message())});
}

promise.emplace_value();
});
return std::move(pf.future);
})
.get_async([=, weak_self = weak_from_this()](Status s) {
// Keep the sync session alive while it's downloading, but then close
// it immediately
sync_session->close();
Expand All @@ -401,8 +422,7 @@ void SyncSession::download_fresh_realm(sync::ProtocolErrorInfo::Action server_re
strong_self->handle_fresh_realm_downloaded(db, none, server_requests_action);
}
else {
strong_self->handle_fresh_realm_downloaded(nullptr, s.get_status().reason(),
server_requests_action);
strong_self->handle_fresh_realm_downloaded(nullptr, s.reason(), server_requests_action);
}
}
});
Expand Down