AnonHxy commented on code in PR #17421:
URL: https://github.com/apache/pulsar/pull/17421#discussion_r962179028
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java:
##########
@@ -1559,27 +1559,17 @@ protected CompletableFuture<Void>
internalDeletePersistenceAsync() {
.thenCompose(__ -> doUpdatePersistenceAsync(null));
}
- protected void internalSetPersistence(PersistencePolicies persistence) {
- validateNamespacePolicyOperation(namespaceName,
PolicyName.PERSISTENCE, PolicyOperation.WRITE);
- validatePoliciesReadOnlyAccess();
- validatePersistencePolicies(persistence);
-
- doUpdatePersistence(persistence);
- }
-
- private void doUpdatePersistence(PersistencePolicies persistence) {
- try {
- updatePolicies(namespaceName, policies -> {
- policies.persistence = persistence;
- return policies;
- });
- log.info("[{}] Successfully updated persistence configuration:
namespace={}, map={}", clientAppId(),
- namespaceName,
jsonMapper().writeValueAsString(persistence));
- } catch (Exception e) {
- log.error("[{}] Failed to update persistence configuration for
namespace {}", clientAppId(), namespaceName,
- e);
- throw new RestException(e);
- }
+ protected CompletableFuture<Void>
internalSetPersistenceAsync(PersistencePolicies persistence) {
+ return validateNamespacePolicyOperationAsync(namespaceName,
PolicyName.PERSISTENCE, PolicyOperation.WRITE)
+ .thenCompose(__ -> validatePoliciesReadOnlyAccessAsync())
+ .thenAccept(__ -> validatePersistencePolicies(persistence))
+ .thenCompose(__ -> {
+ return CompletableFuture.supplyAsync(() -> {
+ validatePersistencePolicies(persistence);
+ return null;
+ });
+ })
Review Comment:
We should remove this cold block I think
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java:
##########
@@ -1559,27 +1559,17 @@ protected CompletableFuture<Void>
internalDeletePersistenceAsync() {
.thenCompose(__ -> doUpdatePersistenceAsync(null));
}
- protected void internalSetPersistence(PersistencePolicies persistence) {
- validateNamespacePolicyOperation(namespaceName,
PolicyName.PERSISTENCE, PolicyOperation.WRITE);
- validatePoliciesReadOnlyAccess();
- validatePersistencePolicies(persistence);
-
- doUpdatePersistence(persistence);
- }
-
- private void doUpdatePersistence(PersistencePolicies persistence) {
- try {
- updatePolicies(namespaceName, policies -> {
- policies.persistence = persistence;
- return policies;
- });
- log.info("[{}] Successfully updated persistence configuration:
namespace={}, map={}", clientAppId(),
- namespaceName,
jsonMapper().writeValueAsString(persistence));
- } catch (Exception e) {
- log.error("[{}] Failed to update persistence configuration for
namespace {}", clientAppId(), namespaceName,
- e);
- throw new RestException(e);
- }
+ protected CompletableFuture<Void>
internalSetPersistenceAsync(PersistencePolicies persistence) {
+ return validateNamespacePolicyOperationAsync(namespaceName,
PolicyName.PERSISTENCE, PolicyOperation.WRITE)
+ .thenCompose(__ -> validatePoliciesReadOnlyAccessAsync())
+ .thenAccept(__ -> validatePersistencePolicies(persistence))
+ .thenCompose(__ -> {
+ return CompletableFuture.supplyAsync(() -> {
+ validatePersistencePolicies(persistence);
+ return null;
+ });
+ })
+ .thenCompose(__ -> doUpdatePersistenceAsync(null));
Review Comment:
`doUpdatePersistenceAsync(null)` -> `doUpdatePersistenceAsync(persistence)`
--
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]
