Skip to content

Move obliterate reconnection under separate flag and improve behavior#22080

Merged
anthony-murphy merged 11 commits into
microsoft:mainfrom
anthony-murphy:fix-obliterate-reconnect
Aug 1, 2024
Merged

Move obliterate reconnection under separate flag and improve behavior#22080
anthony-murphy merged 11 commits into
microsoft:mainfrom
anthony-murphy:fix-obliterate-reconnect

Conversation

@anthony-murphy
Copy link
Copy Markdown
Contributor

@anthony-murphy anthony-murphy commented Jul 31, 2024

The obliterate logic for reconnect is not well defined. This change puts that behavior under a separate flag to ensure reconnects with obliterate are only done intentionally. Secondarily, this change modifies how it works with reconnect when there is a remote obliterate, and a local insert. The change essentially rolls back the insert, rather than having it bypass the obliterate.

related AB#3714

@anthony-murphy anthony-murphy requested review from a team as code owners July 31, 2024 20:42
@azure-boards
Copy link
Copy Markdown

azure-boards Bot commented Jul 31, 2024

✅ Successfully linked to Azure Boards work item(s):

@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Jul 31, 2024

⚠️ No Changeset found

Latest commit: 345d6e6

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions Bot added base: main PRs targeted against main branch area: dds Issues related to distributed data structures area: dds: sharedstring public api change Changes to a public API labels Jul 31, 2024
Comment thread packages/dds/merge-tree/src/client.ts Outdated
@msfluid-bot
Copy link
Copy Markdown
Collaborator

msfluid-bot commented Jul 31, 2024

@fluid-example/bundle-size-tests: +416 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 461.15 KB 461.24 KB +92 Bytes
azureClient.js 558.32 KB 558.37 KB +49 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 261.76 KB 261.78 KB +14 Bytes
fluidFramework.js 409.15 KB 409.17 KB +14 Bytes
loader.js 134.04 KB 134.05 KB +14 Bytes
map.js 42.13 KB 42.14 KB +7 Bytes
matrix.js 146.48 KB 146.54 KB +64 Bytes
odspClient.js 526.46 KB 526.51 KB +49 Bytes
odspDriver.js 97.55 KB 97.57 KB +21 Bytes
odspPrefetchSnapshot.js 42.61 KB 42.62 KB +14 Bytes
sharedString.js 163.21 KB 163.27 KB +64 Bytes
sharedTree.js 399.67 KB 399.67 KB +7 Bytes
Total Size 3.32 MB 3.32 MB +416 Bytes

Baseline commit: faf7f68

Generated by 🚫 dangerJS against 345d6e6

Comment thread packages/dds/merge-tree/src/mergeTree.ts Outdated
anthony-murphy and others added 3 commits July 31, 2024 14:59
@anthony-murphy anthony-murphy merged commit a6a711f into microsoft:main Aug 1, 2024
@anthony-murphy anthony-murphy deleted the fix-obliterate-reconnect branch August 1, 2024 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: dds: sharedstring area: dds Issues related to distributed data structures base: main PRs targeted against main branch public api change Changes to a public API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants