You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xy...@apache.org on 2026/06/23 12:22:07 UTC
(pulsar) branch branch-4.2 updated: [feat][broker] Expose managed ledger properties via topic internal stats (#26079)
This is an automated email from the ASF dual-hosted git repository.
BewareMyPower pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new 20561a4a007e [feat][broker] Expose managed ledger properties via topic internal stats (#26079)
20561a4a007e is described below
commit 20561a4a007ec07c7ab72e367dbc2b83dca5e64a
Author: Yunze Xu <xy...@163.com>
AuthorDate: Tue Jun 23 16:33:40 2026 +0800
[feat][broker] Expose managed ledger properties via topic internal stats (#26079)
(cherry picked from commit 6d0d99b7c4241b376e4e532183691f8ee48df9ba)
---
.../bookkeeper/mledger/impl/ManagedLedgerImpl.java | 4 ++-
.../broker/service/persistent/PersistentTopic.java | 1 +
.../apache/pulsar/broker/admin/AdminApi2Test.java | 38 ++++++++++++++++++++++
.../policies/data/ManagedLedgerInternalStats.java | 3 ++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index b1a7e199740c..d5462bd76ebb 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -4978,7 +4978,9 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
stats.lastConfirmedEntry = this.getLastConfirmedEntry().toString();
stats.state = this.getState().toString();
- stats.cursors = new HashMap();
+ stats.properties = new HashMap<>(propertiesMap);
+
+ stats.cursors = new HashMap<>();
this.getCursors().forEach(c -> {
ManagedCursorImpl cursor = (ManagedCursorImpl) c;
PersistentTopicInternalStats.CursorStats cs = new PersistentTopicInternalStats.CursorStats();
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 87e9d0d28e0f..08a8dc54196b 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
@@ -3064,6 +3064,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
stats.lastConfirmedEntry = ledgerInternalStats.getLastConfirmedEntry();
stats.state = ledgerInternalStats.getState();
stats.ledgers = ledgerInternalStats.ledgers;
+ stats.properties = ledgerInternalStats.getProperties();
// Add ledger info for compacted topic ledger if exist.
LedgerInfo info = new LedgerInfo();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index 774c195b7fbb..bcc61dec08a0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -69,7 +69,9 @@ import lombok.AllArgsConstructor;
import lombok.Cleanup;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.ManagedLedger;
+import org.apache.bookkeeper.mledger.ManagedLedgerException;
import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl;
import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -1440,6 +1442,42 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
}
}
+ @Test
+ public void testGetInternalStatsWithProperties() throws Exception {
+ final var namespace = newUniqueName(defaultTenant + "/ns2");
+ final var topicName = "persistent://" + namespace + "/testGetInternalStatsWithProperties";
+ admin.namespaces().createNamespace(namespace);
+
+ final var topicProperties = Map.of("key1", "value1", "key2", "value2");
+ admin.topics().createNonPartitionedTopic(topicName, topicProperties);
+
+ var stats = admin.topics().getInternalStats(topicName);
+ assertEquals(stats.properties, topicProperties);
+
+ var persistentTopic = (PersistentTopic) pulsar.getBrokerService().getTopicIfExists(topicName).get()
+ .orElseThrow();
+ final var future = new CompletableFuture<Map<String, String>>();
+ persistentTopic.getManagedLedger().asyncSetProperty("new-key", "new-value",
+ new AsyncCallbacks.UpdatePropertiesCallback() {
+ @Override
+ public void updatePropertiesComplete(Map<String, String> properties, Object ctx) {
+ future.complete(properties);
+ }
+
+ @Override
+ public void updatePropertiesFailed(ManagedLedgerException exception, Object ctx) {
+ future.completeExceptionally(exception);
+ }
+ }, null);
+ assertEquals(future.get(), Map.of("key1", "value1", "key2", "value2", "new-key", "new-value"));
+
+ admin.namespaces().unload(namespace);
+ persistentTopic = (PersistentTopic) pulsar.getBrokerService().getTopic(topicName, true).get()
+ .orElseThrow();
+ stats = admin.topics().getInternalStats(topicName);
+ assertEquals(stats.properties, Map.of("key1", "value1", "key2", "value2", "new-key", "new-value"));
+ }
+
@Test
public void testNonPersistentTopics() throws Exception {
final String namespace = newUniqueName(defaultTenant + "/ns2");
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
index 87228fa37362..c109e2692021 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
@@ -71,6 +71,9 @@ public class ManagedLedgerInternalStats {
/** The list of all cursors on this topic. Each subscription in the topic stats has a cursor. */
public Map<String, CursorStats> cursors;
+ /** The properties map of the managed ledger. */
+ public Map<String, String> properties;
+
/**
* Ledger information.
*/