You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2025/05/09 17:55:50 UTC
(pulsar) 09/23: [fix][test] Fix flaky ManagedCursorTest.testLastActiveAfterResetCursor and disable failing SchemaTest (#24261)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4e2047b55991f8bacc27a130907124bcfef775da
Author: Lari Hotari <lh...@users.noreply.github.com>
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 f4a64d267fd..17988135c80 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
@@ -1460,8 +1460,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 0661fab4015..bcaed2d7322 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
@@ -1004,6 +1004,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 b61c902d759..711e8ba5ad7 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
@@ -1528,7 +1528,8 @@ public class SchemaTest extends MockedPulsarServiceBaseTest {
producer.close();
}
- @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));