This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 6eb7f7bb7653c70a023d15eb69d196d849222b11 Author: Lari Hotari <[email protected]> AuthorDate: Wed May 7 14:10:33 2025 +0300 [fix][test] Fix flaky ManagedCursorTest.testLastActiveAfterResetCursor and disable failing SchemaTest (#24261) (cherry picked from commit 616c3a1b2b731f5c15fef0d34670845510a5fdf0) --- .../java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +- .../java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java | 3 +++ pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java index 84b43e16e67..ca10c10b83a 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java @@ -1446,8 +1446,8 @@ public class ManagedCursorImpl implements ManagedCursor { ledger.getName(), newReadPosition, name); } } - callback.resetComplete(newReadPosition); updateLastActive(); + callback.resetComplete(newReadPosition); } @Override diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java index d77088a9e86..a057232ce38 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java @@ -999,6 +999,9 @@ public class ManagedCursorTest extends MockedBookKeeperTestCase { long lastActive = cursor.getLastActive(); + // ensure that the next last active time will be greater than the current one + Thread.sleep(1L); + cursor.asyncResetCursor(lastPosition, false, new AsyncCallbacks.ResetCursorCallback() { @Override public void resetComplete(Object ctx) { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java index 8908b9e96c3..9d508425eef 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java @@ -1450,7 +1450,8 @@ public class SchemaTest extends MockedPulsarServiceBaseTest { } - @Test + // This test fails consistently, disabling until it is fixed. Issue https://github.com/apache/pulsar/issues/24262 + @Test(enabled = false) public void testPendingQueueSizeIfIncompatible() throws Exception { final String namespace = BrokerTestUtil.newUniqueName(PUBLIC_TENANT + "/ns"); admin.namespaces().createNamespace(namespace, Sets.newHashSet(CLUSTER_NAME));
