eolivelli commented on a change in pull request #13876:
URL: https://github.com/apache/pulsar/pull/13876#discussion_r789562360
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
##########
@@ -2383,42 +2383,51 @@ private PositionImpl calculatePositionAckSet(boolean
isExcluded, int batchSize,
protected void internalGetMessageById(AsyncResponse asyncResponse, long
ledgerId, long entryId,
boolean authoritative) {
- try {
- // will redirect if the topic not owned by current broker
- validateTopicOwnership(topicName, authoritative);
- validateTopicOperation(topicName, TopicOperation.PEEK_MESSAGES);
-
- if (topicName.isGlobal()) {
- validateGlobalNamespaceOwnership(namespaceName);
- }
- PersistentTopic topic = (PersistentTopic)
getTopicReference(topicName);
- ManagedLedgerImpl ledger = (ManagedLedgerImpl)
topic.getManagedLedger();
- ledger.asyncReadEntry(new PositionImpl(ledgerId, entryId), new
AsyncCallbacks.ReadEntryCallback() {
- @Override
- public void readEntryFailed(ManagedLedgerException exception,
Object ctx) {
- asyncResponse.resume(new RestException(exception));
- }
-
- @Override
- public void readEntryComplete(Entry entry, Object ctx) {
- try {
- asyncResponse.resume(generateResponseWithEntry(entry));
- } catch (IOException exception) {
- asyncResponse.resume(new RestException(exception));
- } finally {
- if (entry != null) {
- entry.release();
- }
+ // will redirect if the topic not owned by current broker
+ validateTopicOwnershipAsync(topicName, authoritative)
+ .thenCompose(__ -> validateTopicOperationAsync(topicName,
TopicOperation.PEEK_MESSAGES))
+ .thenCompose(__ -> {
+ CompletableFuture<Void> ret;
+ if (topicName.isGlobal()) {
+ ret =
validateGlobalNamespaceOwnershipAsync(namespaceName);
+ } else {
+ ret = CompletableFuture.completedFuture(null);
}
- }
- }, null);
- } catch (NullPointerException npe) {
- asyncResponse.resume(new RestException(Status.NOT_FOUND, "Message
not found"));
- } catch (Exception exception) {
- log.error("[{}] Failed to get message with ledgerId {} entryId {}
from {}",
- clientAppId(), ledgerId, entryId, topicName, exception);
- asyncResponse.resume(new RestException(exception));
- }
+ return ret.thenCompose(ignore -> {
+ return getTopicReferenceAsync(topicName)
+ .thenAccept(topic -> {
Review comment:
we already checked that the topic is here with
validateTopicOwnershipAsync
I am not sure it is needed,
in the old code we did not check for nulls
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
