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

Automation: main-next integrate #18779

Merged
merged 5 commits into from
Dec 12, 2023
Merged

Automation: main-next integrate #18779

merged 5 commits into from
Dec 12, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

DO NOT MERGE THIS PR USING THE GITHUB UI.

The aim of this pull request is to sync main and next branch. If this PR is assigned to you, you need to do the following:

  1. Acknowledge the pull request by adding a comment -- "Actively working on it".
  2. If there are no CI failures, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.
  3. If there are CI failures, check out the main-next-0041dd3 branch and make code changes to fix the failures.
  • You can ignore any failures in the Real service e2e test and Stress test pipelines. These pipelines are not required to pass to merge changes.
  1. Do NOT rebase or squash the main-next-0041dd3 branch: its history must be preserved. Always amend the HEAD commit using the following git commands:
  • git commit --amend -m "Automation: main-next integrate"
  • git push --force-with-lease

Once CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.

yann-achard-MS and others added 5 commits December 11, 2023 18:53
This is used on the alpha surface of client, so also need to be marked
alpha:

https://github.com/microsoft/FluidFramework/blob/b3e6b6bbd57222548a5d914da1220cb2c1a89be0/packages/loader/container-loader/src/protocol.ts#L9

Co-authored-by: Tony Murphy <anthonm@microsoft.com>
We have mechanisms in place that help prevent ops from being resubmitted
if they were successfully sequenced by service (but our client didn't
have time to see the ack before disconnecting).
Added comments in some key places so people interested can quickly find
the code that prevents this.

Example scenario:

| **Step** | **clientId value** | **PendingStateManager** |

|--------------------------------------------|----------------|---------------------|
| Client A sends op 1 | Client A | [op 1] |
| Client A disconnects | Client A | [op 1] |
| Client A reconnects as Client B | Client A | [op 1] |
| **Start wait to see "leave" op from Client A** | Client A | [op 1] |
| See ack for op 1 | Client A | **[]** |
| See "leave" for Client A | **Client B** | [] |
After a data store is deleted as a result of sweep, further modification
to it must be prevented to cause any data loss. This has been added via
a GC sweep op which will be received by all clients
#18632.
However, due to an unexpected bug, a client could have a (to be) deleted
data store loaded and before it receives the GC sweep op, this data
store can send an op or signal. These ops must be ignored after the data
store is deleted to not cause document corruption. This PR adds this
logic. An error is still logged and it can be used to identify if such
case ever happens.

AB#6113
@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +1.1 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 454.62 KB 455.13 KB +523 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 241.16 KB 241.67 KB +521 Bytes
loader.js 166.81 KB 166.82 KB +2 Bytes
map.js 46.7 KB 46.7 KB +2 Bytes
matrix.js 147.3 KB 147.31 KB +2 Bytes
odspDriver.js 90.35 KB 90.36 KB +2 Bytes
odspPrefetchSnapshot.js 41.82 KB 41.82 KB +2 Bytes
sharedString.js 165.55 KB 165.55 KB No change
sharedTree2.js 288.58 KB 288.65 KB +70 Bytes
Total Size 1.76 MB 1.76 MB +1.1 KB

Baseline commit: 5d2dce4

Generated by 🚫 dangerJS against 7fc7f65

@sonalideshpandemsft sonalideshpandemsft merged commit 7fc7f65 into next Dec 12, 2023
39 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-0041dd3 branch December 12, 2023 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
base: next PRs targeted against next branch main-next-integrate merge-ok
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants