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 #18777

Merged
merged 9 commits into from
Dec 12, 2023
Merged

Automation: main-next integrate #18777

merged 9 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-d6957c5 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-d6957c5 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.

alex-pardes and others added 9 commits December 8, 2023 16:10
…rather than on ack (#18709)

## Description

Update shared matrix FWW policy to immediately switch mode on switch
rather than on ack. Currently we were sending policy switch op
separately to change policy from LWW to FWW and local changes after that
were still treated as LWW.
With these changes, any local changes after policy switch will also be
treated as FWW and there will be no separate op for policy switch. This
would help the app when switching policy on open, to not change the last
edit time for the user. The policy will be communicated by first setCell
op after the user has switched policy locally.

---------

Co-authored-by: Jatin Garg <[email protected]>
## Description

This PR updates the in-memory schema repository's mutability contract.
It ensures that data is consistently and cleanly copied. Additionally,
it introduces efficient cloning in some cases. This improvement will
enhance branching efficiency, especially in scenarios where frequent
forking of the schema repository occurs. It also aims to reduce bugs
related to misunderstandings about the mutability of in-memory schema
repository objects.
## Description

> Updates the default/starting value for globalCheckpointOnly based on
the configuration, and logs if the cluster received the NoClient Op and
if it is the session end checkpoint to see if the NoClient Op is
received before closing the session.
@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +1.13 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 454.84 KB 454.84 KB +2 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 241.28 KB 241.28 KB No change
loader.js 166.81 KB 166.82 KB +2 Bytes
map.js 46.7 KB 46.7 KB +2 Bytes
matrix.js 147.36 KB 147.43 KB +73 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.55 KB 289.59 KB +1.04 KB
Total Size 1.76 MB 1.76 MB +1.13 KB

Baseline commit: 6960568

Generated by 🚫 dangerJS against 6b2f40b

@sonalideshpandemsft sonalideshpandemsft merged commit 6b2f40b into next Dec 12, 2023
39 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-d6957c5 branch December 12, 2023 06:18
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.

7 participants