-
Notifications
You must be signed in to change notification settings - Fork 136
XCOMMONS-3451: Realtime editing doesn't support clustering #1475
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
Merged
Conversation
This file contains hidden or 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
vmassol
reviewed
Oct 10, 2025
...ki-commons-netflux/src/main/java/org/xwiki/netflux/internal/user/local/LocalUserHandler.java
Outdated
Show resolved
Hide resolved
vmassol
reviewed
Oct 10, 2025
...ns-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/user/UserHandler.java
Outdated
Show resolved
Hide resolved
vmassol
reviewed
Oct 10, 2025
.../xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/user/DefaultUserHandler.java
Outdated
Show resolved
Hide resolved
vmassol
reviewed
Oct 10, 2025
.../xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/user/DefaultUserHandler.java
Outdated
Show resolved
Hide resolved
7b23e1c to
651de05
Compare
4c568b3 to
04a7ae7
Compare
04a7ae7 to
ad7f3f1
Compare
ad7f3f1 to
1fbe7f8
Compare
8f48a71 to
12ba82c
Compare
mflorea
reviewed
Nov 27, 2025
Member
mflorea
left a comment
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.
Looks good.
.../xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/DefaultLocalUserFactory.java
Outdated
Show resolved
Hide resolved
xwiki-commons-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/Netflux.java
Show resolved
Hide resolved
36f309a to
6f1a111
Compare
6f1a111 to
91294f2
Compare
* Remove leftovers from a previous implementation which did not really made sense anymore (mainly around the concept of "connected user") * Add the concept of Remote and Local users * Reusing the websocket session id as local user id * Make modifications go through events (even locally) so that other cluster members know about them
91294f2 to
1236db9
Compare
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-stable-17.10.x stable-17.10.x
# Navigate to the new working tree
cd .worktrees/backport-stable-17.10.x
# Create a new branch
git switch --create backport-1475-to-stable-17.10.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 89518a352b9e574f3f10876b17a4c6f05f8123fd
# Push it to GitHub
git push --set-upstream origin backport-1475-to-stable-17.10.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-stable-17.10.xThen, create a pull request where the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
xwiki-platform side of things: xwiki/xwiki-platform#4656
Jira URL
https://jira.xwiki.org/browse/XCOMMONS-3451
Changes
Description
TODO:
Clarifications
The general idea is to distribute everything that happens (user joining, leaving, updates) on all cluster nodes.
Screenshots & Video
Executed Tests
Expected merging strategy