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.

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

RCORE-2150 Include originating client reset error message when reporting auto client reset failures #7761

Merged
merged 4 commits into from
Jun 3, 2024

Conversation

michael-wb
Copy link
Contributor

@michael-wb michael-wb commented May 31, 2024

What, How & Why?

The originating client reset error was not included in the error reported to the client as part of the changes from #7649. This PR adds the originating client reset error to the error message included with the AutoClientResetFailed error reported to the client.
Fixes #7760

☑️ ToDos

  • 📝 Changelog update
  • 🚦 Tests (or not relevant)
    * [ ] C-API, if public C++ API changed
    * [ ] bindgen/spec.yml, if public C++ API changed

Copy link

coveralls-official bot commented May 31, 2024

Pull Request Test Coverage Report for Build michael.wilkersonbarker_1135

Details

  • 34 of 34 (100.0%) changed or added relevant lines in 4 files are covered.
  • 31 unchanged lines in 7 files lost coverage.
  • Overall coverage increased (+0.04%) to 90.845%

Files with Coverage Reduction New Missed Lines %
src/realm/sync/noinst/server/server_history.cpp 1 63.7%
src/realm/cluster.cpp 2 75.6%
test/test_sync.cpp 2 92.89%
src/realm/sync/transform.cpp 3 61.11%
src/realm/util/assert.hpp 4 87.1%
test/fuzz_group.cpp 6 51.36%
src/realm/bplustree.cpp 13 71.41%
Totals Coverage Status
Change from base Build 2373: 0.04%
Covered Lines: 214627
Relevant Lines: 236256

💛 - Coveralls

@@ -408,7 +408,7 @@ class SyncSession : public std::enable_shared_from_this<SyncSession> {

void download_fresh_realm(const sync::SessionErrorInfo& error_info)
REQUIRES(!m_config_mutex, !m_state_mutex, !m_connection_state_mutex);
void handle_fresh_realm_downloaded(DBRef db, StatusWith<sync::SessionErrorInfo> error_info,
void handle_fresh_realm_downloaded(DBRef db, Status result, const sync::SessionErrorInfo& cr_error_info,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this change back?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I needed access to both the Status that just occurred as well as the SessionErrorInfo for the originating client reset error. When it was using the StatusWith, you would only have access to one or the other...

@michael-wb michael-wb merged commit e246b7d into master Jun 3, 2024
38 checks passed
@michael-wb michael-wb deleted the mwb/propagate-cr-error branch June 3, 2024 19:19
@github-actions github-actions bot mentioned this pull request Jun 7, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Include originating client reset error message when reporting auto client reset failures
3 participants