LeBW commented on a change in pull request #12215:
URL: https://github.com/apache/pulsar/pull/12215#discussion_r735227272
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
##########
@@ -978,21 +981,74 @@ public void unloadNamespaceBundlesGracefully() {
}
CompletableFuture<Void> future = new CompletableFuture<>();
- managedLedgerFactory.asyncDelete(tn.getPersistenceNamingEncoding(),
new DeleteLedgerCallback() {
- @Override
- public void deleteLedgerComplete(Object ctx) {
- future.complete(null);
- }
- @Override
- public void deleteLedgerFailed(ManagedLedgerException exception,
Object ctx) {
- future.completeExceptionally(exception);
+ CompletableFuture<Void> deleteTopicAuthenticationFuture = new
CompletableFuture<>();
+ deleteTopicAuthenticationWithRetry(topic,
deleteTopicAuthenticationFuture, 5);
+ deleteTopicAuthenticationFuture.whenComplete((v, ex) -> {
+ if (ex != null) {
+ future.completeExceptionally(ex);
+ return;
}
- }, null);
+
managedLedgerFactory.asyncDelete(tn.getPersistenceNamingEncoding(), new
DeleteLedgerCallback() {
+ @Override
+ public void deleteLedgerComplete(Object ctx) {
+ future.complete(null);
+ }
+
+ @Override
+ public void deleteLedgerFailed(ManagedLedgerException
exception, Object ctx) {
+ future.completeExceptionally(exception);
+ }
+ }, null);
+ });
+
return future;
}
+ public void deleteTopicAuthenticationWithRetry(String topic,
CompletableFuture<Void> future, int count) {
+ if (count == 0) {
+ log.error("The number of retries has exhausted for topic {}",
topic);
+ future.completeExceptionally(new MetadataStoreException("The
number of retries has exhausted"));
+ return;
+ }
+ NamespaceName namespaceName =
TopicName.get(topic).getNamespaceObject();
+ // Check whether there are auth policies for the topic
+
pulsar.getPulsarResources().getNamespaceResources().getPoliciesAsync(namespaceName).thenAccept(optPolicies
-> {
+ if (!optPolicies.isPresent() ||
!optPolicies.get().auth_policies.getTopicAuthentication()
+ .containsKey(topic)) {
+ // if there is no auth policy for the topic, just complete and
return
+ log.info("Auth policies not found for topic {}", topic);
Review comment:
Fixed
--
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]
