Skip to content

[fix] [admin] set offload threshold should fail if ns policies is read-only #19383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 3 commits into from
Feb 2, 2023
Merged

[fix] [admin] set offload threshold should fail if ns policies is read-only #19383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b23a1ee
[fix] [admin] set offload threshold should fail when ns policies is r…
poorbarcode Feb 1, 2023
8defc38
remove empty line
poorbarcode Feb 1, 2023
546c049
mv cleanup to finally block
poorbarcode Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class NamespaceResources extends BaseResources<Policies> {
private final PartitionedTopicResources partitionedTopicResources;
private final MetadataStore configurationStore;

private static final String POLICIES_READONLY_FLAG_PATH = "/admin/flags/policies-readonly";
public static final String POLICIES_READONLY_FLAG_PATH = "/admin/flags/policies-readonly";
private static final String NAMESPACE_BASE_PATH = "/namespace";
private static final String BUNDLE_DATA_BASE_PATH = "/loadbalance/bundle-data";

Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,7 @@ protected CompletableFuture<Void> internalSetOffloadThresholdInSecondsAsync(long
CompletableFuture<Void> f = new CompletableFuture<>();

validateNamespacePolicyOperationAsync(namespaceName, PolicyName.OFFLOAD, PolicyOperation.WRITE)
.thenApply(v -> validatePoliciesReadOnlyAccessAsync())
.thenCompose(v -> validatePoliciesReadOnlyAccessAsync())
.thenCompose(v -> updatePoliciesAsync(namespaceName,
policies -> {
if (policies.offload_policies == null) {
Expand Down
23 changes: 23 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,17 @@
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.mledger.LedgerOffloader;
import org.apache.bookkeeper.mledger.ManagedLedgerInfo;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.broker.resources.NamespaceResources;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.admin.LongRunningProcessStatus;
import org.apache.pulsar.client.admin.PulsarAdminException.ConflictException;
Expand Down Expand Up @@ -290,6 +293,26 @@ public void testSetNamespaceOffloadPolicies() throws Exception {
assertEquals(admin.namespaces().getOffloadPolicies(myNamespace), policies);
}

@Test
public void testSetNamespaceOffloadPoliciesFailByReadOnly() throws Exception {
boolean setNsPolicyReadOnlySuccess = false;
try {
pulsar.getConfigurationMetadataStore().put(NamespaceResources.POLICIES_READONLY_FLAG_PATH, "0".getBytes(),
Optional.empty()).join();
setNsPolicyReadOnlySuccess = true;
admin.namespaces().setOffloadThresholdInSeconds(myNamespace, 300);
fail("set offload threshold should fail when ns policies is readonly");
} catch (Exception ex){
// ignore.
} finally {
// cleanup.
if (setNsPolicyReadOnlySuccess) {
pulsar.getConfigurationMetadataStore().delete(NamespaceResources.POLICIES_READONLY_FLAG_PATH,
Optional.empty()).join();
}
}
}

@Test
public void testSetTopicOffloadPolicies() throws Exception {
conf.setManagedLedgerOffloadThresholdInSeconds(100);
Expand Down