Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Wait for download completion when downloading fresh FLX realm in clie…
Browse files Browse the repository at this point in the history
…nt reset
jbreams committed Sep 2, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 8ee550c commit 768958e
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions src/realm/object-store/sync/sync_session.cpp
Original file line number Diff line number Diff line change
@@ -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();
@@ -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);
}
}
});

0 comments on commit 768958e

Please sign in to comment.