This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new efa971b09db branch-4.1: [fix](test) stabilize BDB unmatched
transaction test (#65757)
efa971b09db is described below
commit efa971b09dbcfbd15341c7efd323af6a401848b6
Author: shuke <[email protected]>
AuthorDate: Thu Jul 23 14:14:22 2026 +0800
branch-4.1: [fix](test) stabilize BDB unmatched transaction test (#65757)
### What problem does this PR solve?
Issue Number: None
Related PR: #65587
Problem Summary:
Backport the stabilization of
`BDBEnvironmentTest.testReadTxnIsNotMatched` to `branch-4.1`. The
release-branch test partially mocked a live JE `RepImpl` with JMockit,
which could miss or intercept `registerVLSN` inconsistently while BDB
background threads were active. It also read follower state before
asynchronous replication was guaranteed visible.
This tailored pick waits for the baseline value on followers, uses a
method-scoped Mockito spy that throws only from `postLogCommitHook`,
restores both original JE environment fields in `finally`, and verifies
the exact locally committed value after restart.
### Release note
None
### Check List (For Author)
- Test
- [ ] Regression test
- [x] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason
- Behavior changed:
- [x] No.
- [ ] Yes.
- Does this need documentation?
- [x] No.
- [ ] Yes.
Validation:
- Target FE UT passed twice locally.
- `git diff --check` passed.
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label
---
.../doris/journal/bdbje/BDBEnvironmentTest.java | 68 ++++++++++++++--------
1 file changed, 43 insertions(+), 25 deletions(-)
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
b/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
index cae2ec0f699..87bc9191d41 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
@@ -36,16 +36,17 @@ import com.sleepycat.je.rep.InsufficientAcksException;
import com.sleepycat.je.rep.ReplicatedEnvironment;
import com.sleepycat.je.rep.impl.RepImpl;
import com.sleepycat.je.rep.util.ReplicationGroupAdmin;
-import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.RepeatedTest;
+import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
@@ -60,6 +61,7 @@ import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
public class BDBEnvironmentTest {
private static final Logger LOG =
LogManager.getLogger(BDBEnvironmentTest.class);
@@ -125,6 +127,19 @@ public class BDBEnvironmentTest {
return byteArray;
}
+ private void assertDatabaseValueEventually(BDBEnvironment environment,
String dbName,
+ DatabaseEntry key, DatabaseEntry expectedValue) {
+ Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+ Assertions.assertEquals(1, environment.getDatabaseNames().size());
+ Database database = environment.openDatabase(dbName);
+ Assertions.assertNotNull(database);
+ DatabaseEntry actualValue = new DatabaseEntry();
+ Assertions.assertEquals(OperationStatus.SUCCESS,
+ database.get(null, key, actualValue, LockMode.DEFAULT));
+ Assertions.assertArrayEquals(expectedValue.getData(),
actualValue.getData());
+ });
+ }
+
private static DatabaseEntry longToEntry(long value) {
DatabaseEntry key = new DatabaseEntry();
TupleBinding<Long> idBinding =
TupleBinding.getPrimitiveBinding(Long.class);
@@ -689,34 +704,36 @@ public class BDBEnvironmentTest {
continue;
}
- Assertions.assertEquals(1,
entryPair.first.getDatabaseNames().size());
- Database followerDb =
entryPair.first.openDatabase(beginDbName);
- DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS,
followerDb.get(null, key, readValue, LockMode.DEFAULT));
- Assertions.assertEquals(new String(value.getData()), new
String(readValue.getData()));
+ assertDatabaseValueEventually(entryPair.first, beginDbName,
key, value);
}
+ long count = masterDb.count();
+ DatabaseEntry localCommitKey = new DatabaseEntry(new byte[]{1, 2,
3});
+ DatabaseEntry localCommitValue = new DatabaseEntry(new byte[]{4,
5, 6});
+
+ ReplicatedEnvironment replicatedEnvironment =
masterPair.first.getReplicatedEnvironment();
Field envImplField =
ReplicatedEnvironment.class.getDeclaredField("repEnvironmentImpl");
envImplField.setAccessible(true);
- RepImpl impl = (RepImpl)
envImplField.get(masterPair.first.getReplicatedEnvironment());
+ RepImpl impl = (RepImpl) envImplField.get(replicatedEnvironment);
Assertions.assertNotNull(impl);
- new Expectations(impl) {{
- // Below method will replicate log item to followers.
- impl.registerVLSN(withNotNull());
- // Below method will wait until the logs are replicated.
- impl.postLogCommitHook(withNotNull(), withNotNull());
- result = new InsufficientAcksException("mocked");
- }};
-
- long count = masterDb.count();
- final Database oldMasterDb = masterDb;
- Assertions.assertThrows(InsufficientAcksException.class, () -> {
- // Since this key is not replicated to any replicas, it should
not be read.
- DatabaseEntry k = new DatabaseEntry(new byte[]{1, 2, 3});
- DatabaseEntry v = new DatabaseEntry(new byte[]{4, 5, 6});
- oldMasterDb.put(null, k, v);
- });
+ Field environmentImplField =
com.sleepycat.je.Environment.class.getDeclaredField("environmentImpl");
+ environmentImplField.setAccessible(true);
+ RepImpl implSpy = Mockito.spy(impl);
+ Mockito.doThrow(new InsufficientAcksException("mocked"))
+ .when(implSpy).postLogCommitHook(Mockito.any(),
Mockito.any());
+
+ try {
+ envImplField.set(replicatedEnvironment, implSpy);
+ environmentImplField.set(replicatedEnvironment, implSpy);
+ final Database oldMasterDb = masterDb;
+ // Simulate an acknowledgement failure after the transaction
is committed locally.
+ Assertions.assertThrows(InsufficientAcksException.class,
+ () -> oldMasterDb.put(null, localCommitKey,
localCommitValue));
+ } finally {
+ envImplField.set(replicatedEnvironment, impl);
+ environmentImplField.set(replicatedEnvironment, impl);
+ }
LOG.info("close old master {} | {}", masterPair.second.name,
masterPair.second.dir);
masterDb.close();
@@ -739,9 +756,10 @@ public class BDBEnvironmentTest {
// The local commit txn is readable!!!
Assertions.assertEquals(count + 1, masterDb.count());
- key = new DatabaseEntry(new byte[]{1, 2, 3});
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS,
masterDb.get(null, key, readValue, LockMode.DEFAULT));
+ Assertions.assertEquals(OperationStatus.SUCCESS,
+ masterDb.get(null, localCommitKey, readValue,
LockMode.DEFAULT));
+ Assertions.assertArrayEquals(localCommitValue.getData(),
readValue.getData());
} finally {
followersInfo.stream().forEach(entryPair -> {
entryPair.first.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
