-
Notifications
You must be signed in to change notification settings - Fork 537
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
PropertyDDS: Summary generation Bug Fix #18072
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nedalhy
reviewed
Oct 31, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
expect(Object.keys(summarizerClient.unrebasedRemoteChanges).length).to.equal(2); | ||
}); | ||
|
||
async function synchronizeMSN(container2: IContainer, container1: IContainer) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Its cleaner and more readable if we move this helper method to the top of the file
CraigMacomber
approved these changes
Nov 27, 2023
noencke
pushed a commit
to noencke/FluidFramework
that referenced
this pull request
Nov 27, 2023
Reverts microsoft#18072 Internal `Build - client packages` failing with identical error after merging [18072](microsoft#18072) Failed Task: `@***-experimental/property-dds: tsc --project ./src/test/tsconfig.json` Error Log: `src/test/propertyTree.spec.ts:226:38 - error TS2304: Cannot find name 'requestFluidObject'.` #### Subsequent Pipeline Failures - [214310](https://dev.azure.com/fluidframework/internal/_build/results?buildId=214310&view=logs&j=3dc8fd7e-4368-5a92-293e-d53cefc8c4b3&t=bfe27d5f-9219-57c0-0d67-1b2946a32921&l=923) - [214366](https://dev.azure.com/fluidframework/internal/_build/results?buildId=214366&view=logs&j=3dc8fd7e-4368-5a92-293e-d53cefc8c4b3&t=bfe27d5f-9219-57c0-0d67-1b2946a32921&l=922) - [214405](https://dev.azure.com/fluidframework/internal/_build/results?buildId=214405&view=logs&j=3dc8fd7e-4368-5a92-293e-d53cefc8c4b3&t=bfe27d5f-9219-57c0-0d67-1b2946a32921&l=927)
yann-achard-MS
pushed a commit
to yann-achard-MS/FluidFramework
that referenced
this pull request
Nov 28, 2023
## Description Revert microsoft#18491 to restore microsoft#18072 but without the build break in the test.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area: dds: propertydds
base: main
PRs targeted against main branch
public api change
Changes to a public API
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How contribute to this repo.
Guidelines for Pull Requests.
Description
This PR fixes a bug that resulted in the prune algorithm in PropertyDDS to prune remoteChanges but keep the associated unrebasedChanges when generating a summary. This could later result in rebase errors for clients that would join using this summary as a starting point.
The problem would occur, when a summarizer has several remote changes in its history, but the MSN points to a state before the first of these changes. In that case, none of those can yet be removed, but the old implementation would incorrectly handle this case and remove the remote change, but keep the unrebasedChanges.
Breaking Changes
This change only affects the summarizer and thus will not cause any incompatibility between clients with different versions.