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 2026/04/22 11:22:06 UTC
(pulsar) branch branch-4.2 updated (7de44804eed -> 1ee8793b25f)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 7de44804eed [fix][test] Fix flaky BrokerRegistryIntegrationTest port binding race (#25463)
new 35049645986 [fix][broker] pulsar admin stats internal with metadata command (#25557)
new 1ee8793b25f [fix][test] Relax BrokerRegistryIntegrationTest broker-close threshold (#25562)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/pulsar/broker/service/persistent/PersistentTopic.java | 5 ++++-
.../loadbalance/extensions/BrokerRegistryIntegrationTest.java | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
(pulsar) 02/02: [fix][test] Relax BrokerRegistryIntegrationTest broker-close threshold (#25562)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 1ee8793b25ff03d957548d9da8863002bfed61fc
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Wed Apr 22 03:28:49 2026 -0700
[fix][test] Relax BrokerRegistryIntegrationTest broker-close threshold (#25562)
(cherry picked from commit f26e3bac7d44c9c16bc0eb7f4b2720d763cf7eb1)
---
.../loadbalance/extensions/BrokerRegistryIntegrationTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistryIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistryIntegrationTest.java
index 588b1c7730e..1c9d9a99804 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistryIntegrationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistryIntegrationTest.java
@@ -70,7 +70,11 @@ public class BrokerRegistryIntegrationTest {
if (bk != null) {
bk.stop();
}
- if (elapsedMs > 5000) {
+ // Guard against regressions where the broker hangs on shutdown (e.g. blocked health
+ // checks or stuck registrations). Keep the threshold generous enough to tolerate CI
+ // variability in BrokerRegistryMetadataStoreIntegrationTest, while still catching the
+ // multi-minute hangs this assertion was originally added to detect.
+ if (elapsedMs > 15000) {
throw new RuntimeException("Broker took " + elapsedMs + "ms to close");
}
}
(pulsar) 01/02: [fix][broker] pulsar admin stats internal with metadata command (#25557)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 35049645986c10b2521a8cbf4de0e950ea9836ae
Author: Rahul <84...@users.noreply.github.com>
AuthorDate: Wed Apr 22 16:43:50 2026 +0530
[fix][broker] pulsar admin stats internal with metadata command (#25557)
Co-authored-by: Rahul Prasad <ra...@flipkart.com>
(cherry picked from commit 9cf1cc9b5bf5d5581fe4e40318b85dfdd2ec77f7)
---
.../org/apache/pulsar/broker/service/persistent/PersistentTopic.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index cb7157314c0..91264a8f7c3 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -3029,6 +3029,9 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
info.ledgerId = compactedTopicContext.getLedger().getId();
info.entries = compactedTopicContext.getLedger().getLastAddConfirmed() + 1;
info.size = compactedTopicContext.getLedger().getLength();
+ if (includeLedgerMetadata) {
+ info.metadata = compactedTopicContext.getLedger().getLedgerMetadata().toSafeString();
+ }
}
stats.compactedLedger = info;
@@ -3110,7 +3113,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
schemaLedgerInfo.entries = metadata.getLastEntryId() + 1;
schemaLedgerInfo.size = metadata.getLength();
if (includeLedgerMetadata) {
- info.metadata = metadata.toSafeString();
+ schemaLedgerInfo.metadata = metadata.toSafeString();
}
stats.schemaLedgers.add(schemaLedgerInfo);
completableFuture.complete(null);