From d98aa102cce7998b656f64335d5b4d93b4518bf8 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 7 May 2025 08:08:47 +0300 Subject: [PATCH 1/3] [fix][ml] Update last active before completing the callback --- .../org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4a64d267fd3e..17988135c80aa 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 void operationComplete() { ledger.getName(), newReadPosition, name); } } - callback.resetComplete(newReadPosition); updateLastActive(); + callback.resetComplete(newReadPosition); } @Override From abf36b523713e6e6ec363131d97f87372135887e Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 7 May 2025 08:18:44 +0300 Subject: [PATCH 2/3] Add delay --- .../org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java | 3 +++ 1 file changed, 3 insertions(+) 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 61822999c7614..879bc7bcd55bd 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 @@ void testLastActiveAfterResetCursor() throws Exception { 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) { From 04cf6dbf9373277bed6c726e2e48f2057fcb26bd Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 7 May 2025 12:06:13 +0300 Subject: [PATCH 3/3] Disable consistenly failing test --- .../src/test/java/org/apache/pulsar/schema/SchemaTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b61c902d759e4..711e8ba5ad7ec 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 SchemaStorageFormat.SchemaLocator deserialize(String path, byte[] content 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));