-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Avoid MongoDB write conflicts in MongoJobRepository by replacing sequence-based ID with TSID #5144
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
Open
diydriller
wants to merge
2
commits into
spring-projects:main
Choose a base branch
from
diydriller:GH-4960
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
101 changes: 101 additions & 0 deletions
101
.../org/springframework/batch/core/repository/dao/mongodb/MongoSequenceIncrementerTests.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright 2024-2025 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.batch.core.repository.dao.mongodb; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.dao.DataAccessException; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| /** | ||
| * Tests for {@link MongoSequenceIncrementer}. | ||
| */ | ||
| public class MongoSequenceIncrementerTests { | ||
|
|
||
| @Test | ||
| void testTimeOrdering() throws DataAccessException { | ||
| MongoSequenceIncrementer incrementer = new MongoSequenceIncrementer(); | ||
| List<Long> ids = new ArrayList<>(); | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| ids.add(incrementer.nextLongValue()); | ||
| } | ||
|
|
||
| List<Long> sorted = new ArrayList<>(ids); | ||
| Collections.sort(sorted); | ||
| assertEquals(sorted, ids, "IDs should be in time order"); | ||
| } | ||
|
|
||
| @Test | ||
| void testConcurrency() throws InterruptedException { | ||
| MongoSequenceIncrementer incrementer = new MongoSequenceIncrementer(); | ||
| Set<Long> ids = Collections.synchronizedSet(new HashSet<>()); | ||
| int threadCount = 10; | ||
| int idsPerThread = 100; | ||
| ExecutorService executor = Executors.newFixedThreadPool(threadCount); | ||
| CountDownLatch latch = new CountDownLatch(threadCount); | ||
|
|
||
| for (int i = 0; i < threadCount; i++) { | ||
| executor.submit(() -> { | ||
| try { | ||
| for (int j = 0; j < idsPerThread; j++) { | ||
| ids.add(incrementer.nextLongValue()); | ||
| } | ||
| } | ||
| catch (DataAccessException e) { | ||
| fail("Should not throw DataAccessException: " + e.getMessage()); | ||
| } | ||
| finally { | ||
| latch.countDown(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| latch.await(10, TimeUnit.SECONDS); | ||
| executor.shutdown(); | ||
|
|
||
| assertEquals(threadCount * idsPerThread, ids.size(), | ||
| "All IDs generated from multiple threads should be unique"); | ||
| } | ||
|
|
||
| @Test | ||
| void testNodeIdSeparation() throws DataAccessException { | ||
| MongoSequenceIncrementer incrementer1 = new MongoSequenceIncrementer(1); | ||
| MongoSequenceIncrementer incrementer2 = new MongoSequenceIncrementer(2); | ||
|
|
||
| long id1 = incrementer1.nextLongValue(); | ||
| long id2 = incrementer2.nextLongValue(); | ||
|
|
||
| assertNotEquals(id1, id2, "IDs from different nodes should be different"); | ||
|
|
||
| long nodeId1 = (id1 >> 12) & 0x3FF; | ||
| long nodeId2 = (id2 >> 12) & 0x3FF; | ||
|
|
||
| assertEquals(1, nodeId1, "First ID should have node ID 1"); | ||
| assertEquals(2, nodeId2, "Second ID should have node ID 2"); | ||
| } | ||
|
|
||
| } |
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
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.
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.
It's still possible same nodeId is used by multiple instances resulting in conflicts.
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.
enhanced the nodeId generation by incorporating the hostname, process ID, and a random value.