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

fix: messages migration from proteus to mls [WPB-15149] 🍒 #3219

Merged
merged 3 commits into from
Jan 13, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 9, 2025

BugWPB-15149 [Android] App is stuck after MLS migration

This PR was automatically cherry-picked based on the following PR:

Original PR description:



PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

When moving messages from proteus conversation to MLS if some message contained reactions or RestrictedAsset then migration failed causing slow sync to break.

Solutions

Migrate MessageRestrictedAssetContent and Reaction tables to update on cascade when Message is changing conversation_id

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

  1. Before enabling mls add reactions to messages on 1on1 conversation
  2. Enable MLS for the team
  3. Trigger slow sync on both clients in the same 1on1 conversation
  4. App should not stuck on sync and user should see that current 1on1 conversation is using MLS protocol

Attachments (Optional)

Wire 2025-01-08 at 3_34 PM

@yamilmedina yamilmedina enabled auto-merge January 9, 2025 15:17
@echoes-hq echoes-hq bot added the echoes: unplanned/incident Work items addressing critical product defects that require immediate action, such as bugs, platf... label Jan 9, 2025
Copy link
Contributor Author

github-actions bot commented Jan 9, 2025

Test Results

3 387 tests  +1   3 279 ✅ +1   5m 39s ⏱️ +3s
  581 suites ±0     108 💤 ±0 
  581 files   ±0       0 ❌ ±0 

Results for commit 7398f6e. ± Comparison against base commit 5788184.

♻️ This comment has been updated with latest results.

Copy link
Contributor Author

github-actions bot commented Jan 9, 2025

@datadog-wireapp
Copy link

datadog-wireapp bot commented Jan 9, 2025

Datadog Report

Branch report: fix/messages-to-mls-conv-migration-cherry-pick
Commit report: c8fb409
Test service: kalium-jvm

✅ 0 Failed, 3279 Passed, 108 Skipped, 1m 0.81s Total Time

@yamilmedina yamilmedina requested review from a team, m-zagorski, alexandreferris, vitorhugods, ohassine and emmaoke-w and removed request for a team January 9, 2025 16:49
@Garzas Garzas requested review from MohamadJaara and removed request for m-zagorski January 13, 2025 10:13
@yamilmedina yamilmedina added this pull request to the merge queue Jan 13, 2025
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.48%. Comparing base (5788184) to head (7398f6e).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3219      +/-   ##
===========================================
+ Coverage    54.16%   54.48%   +0.32%     
===========================================
  Files         1264     1264              
  Lines        36852    36858       +6     
  Branches      3738     3738              
===========================================
+ Hits         19960    20083     +123     
+ Misses       15453    15365      -88     
+ Partials      1439     1410      -29     
Files with missing lines Coverage Δ
...logic/feature/conversation/mls/OneOnOneMigrator.kt 92.85% <100.00%> (+0.66%) ⬆️

... and 6 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5788184...7398f6e. Read the comment docs.

Merged via the queue into develop with commit d54cc28 Jan 13, 2025
23 checks passed
@yamilmedina yamilmedina deleted the fix/messages-to-mls-conv-migration-cherry-pick branch January 13, 2025 11:27
@echoes-hq echoes-hq bot added echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. and removed echoes: unplanned/incident Work items addressing critical product defects that require immediate action, such as bugs, platf... labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. 🚨 Potential breaking changes 👕 size: L type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants