Jason918 commented on a change in pull request #13882:
URL: https://github.com/apache/pulsar/pull/13882#discussion_r790127946
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
##########
@@ -4098,39 +4098,41 @@ private void validateNonPartitionTopicName(String
topicName) {
}
protected void internalGetLastMessageId(AsyncResponse asyncResponse,
boolean authoritative) {
- Topic topic;
- try {
- validateTopicOwnership(topicName, authoritative);
- validateTopicOperation(topicName, TopicOperation.PEEK_MESSAGES);
- topic = getTopicReference(topicName);
- } catch (WebApplicationException wae) {
- if (log.isDebugEnabled()) {
- log.debug("[{}] Failed to get last messageId {}, redirecting
to other brokers.",
- clientAppId(), topicName, wae);
- }
- resumeAsyncResponseExceptionally(asyncResponse, wae);
- return;
- } catch (Exception e) {
- log.error("[{}] Failed to get last messageId {}", clientAppId(),
topicName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
-
- if (!(topic instanceof PersistentTopic)) {
- log.error("[{}] Not supported operation of non-persistent topic
{}", clientAppId(), topicName);
- asyncResponse.resume(new RestException(Status.METHOD_NOT_ALLOWED,
- "GetLastMessageId on a non-persistent topic is not
allowed"));
- return;
- }
-
- topic.getLastMessageId().whenComplete((v, e) -> {
- if (e != null) {
- asyncResponse.resume(new
RestException(Status.INTERNAL_SERVER_ERROR, e.getMessage()));
- } else {
- asyncResponse.resume(v);
- }
+ validateTopicOwnershipAsync(topicName, authoritative)
+ .thenCompose(__ -> validateTopicOperationAsync(topicName,
TopicOperation.PEEK_MESSAGES))
+ .thenCompose(__ -> getTopicReferenceAsync(topicName))
+ .thenAccept(topic -> {
+ if (topic == null) {
+ asyncResponse.resume(new
RestException(Status.NOT_FOUND, "Topic not found"));
+ return;
+ }
+ if (!(topic instanceof PersistentTopic)) {
+ log.error("[{}] Not supported operation of
non-persistent topic {}", clientAppId(), topicName);
+ asyncResponse.resume(new
RestException(Status.METHOD_NOT_ALLOWED,
+ "GetLastMessageId on a non-persistent topic is
not allowed"));
+ }
+ topic.getLastMessageId().whenComplete((v, e) -> {
+ if (e != null) {
+ asyncResponse.resume(new
RestException(Status.INTERNAL_SERVER_ERROR, e.getMessage()));
+ } else {
+ asyncResponse.resume(v);
+ }
+ });
+ }).exceptionally(ex -> {
+ Throwable cause = ex.getCause();
Review comment:
Not all exceptions are wrapped in cause. Need to check first.
--
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]
