Skip to content

[branch-2.9] fix:remove the loadbalance/bundle-data node #15730

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
mattisonchao merged 2 commits into from
May 26, 2022
Merged

[branch-2.9] fix:remove the loadbalance/bundle-data node #15730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb6f7ce
[branch-2.9] fix:remove the loadbalance/bundle-data node
mattisonchao May 24, 2022
b4aaa47
Fix error
mattisonchao May 24, 2022
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
37 changes: 36 additions & 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 @@ -54,7 +54,7 @@ public class NamespaceResources extends BaseResources<Policies> {

private 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";
public NamespaceResources(MetadataStore localStore, MetadataStore configurationStore, int operationTimeoutSec) {
super(configurationStore, Policies.class, operationTimeoutSec);
this.configurationStore = configurationStore;
Expand Down Expand Up @@ -281,4 +281,39 @@ public CompletableFuture<Void> clearPartitionedTopicMetadataAsync(NamespaceName
return completableFuture;
}
}


// clear resource of `/loadbalance/bundle-data/{tenant}/{namespace}/` for zk-node
public CompletableFuture<Void> deleteBundleDataAsync(NamespaceName ns) {
final String namespaceBundlePath = joinPath(BUNDLE_DATA_BASE_PATH, ns.toString());
CompletableFuture<Void> future = new CompletableFuture<Void>();
deleteRecursiveAsync(this, namespaceBundlePath).whenComplete((ignore, ex) -> {
if (ex instanceof MetadataStoreException.NotFoundException) {
future.complete(null);
} else if (ex != null) {
future.completeExceptionally(ex);
} else {
future.complete(null);
}
});

return future;
}

// clear resource of `/loadbalance/bundle-data/{tenant}/` for zk-node
public CompletableFuture<Void> deleteBundleDataTenantAsync(String tenant) {
final String tenantBundlePath = joinPath(BUNDLE_DATA_BASE_PATH, tenant);
CompletableFuture<Void> future = new CompletableFuture<Void>();
deleteRecursiveAsync(this, tenantBundlePath).whenComplete((ignore, ex) -> {
if (ex instanceof MetadataStoreException.NotFoundException) {
future.complete(null);
} else if (ex != null) {
future.completeExceptionally(ex);
} else {
future.complete(null);
}
});

return future;
}
}
4 changes: 3 additions & 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 @@ -323,7 +323,9 @@ protected CompletableFuture<Void> internalClearZkSources() {
// z-node can be deleted now
.thenCompose(ignore -> namespaceResources().deletePoliciesAsync(namespaceName))
// clear z-node of local policies
.thenCompose(ignore -> getLocalPolicies().deleteLocalPoliciesAsync(namespaceName));
.thenCompose(ignore -> getLocalPolicies().deleteLocalPoliciesAsync(namespaceName))
// clear /loadbalance/bundle-data
.thenCompose(ignore -> namespaceResources().deleteBundleDataAsync(namespaceName));

}

Expand Down
2 changes: 2 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ protected void internalDeleteTenant(AsyncResponse asyncResponse, String tenant)
.clearTenantPersistence(tenant))
.thenCompose(ignore -> pulsar().getPulsarResources().getNamespaceResources()
.deleteTenantAsync(tenant))
.thenCompose(ignore -> pulsar().getPulsarResources().getNamespaceResources()
.deleteBundleDataTenantAsync(tenant))
.whenComplete((ignore, ex) -> {
if (ex != null) {
log.error("[{}] Failed to delete tenant {}", clientAppId(), tenant, ex);
Expand Down
5 changes: 5 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,9 @@ public void testDeleteTenant() throws Exception {
assertFalse(admin.tenants().getTenants().contains(tenant));

final String managedLedgersPath = "/managed-ledgers/" + tenant;
final String bundleDataPath = "/loadbalance/bundle-data/" + tenant;
assertFalse(pulsar.getLocalMetadataStore().exists(managedLedgersPath).join());
assertFalse(pulsar.getLocalMetadataStore().exists(bundleDataPath).join());
}

@Test
Expand Down Expand Up @@ -1355,6 +1357,9 @@ public void testDeleteNamespace() throws Exception {

final String managedLedgersPath = "/managed-ledgers/" + namespace;
assertFalse(pulsar.getLocalMetadataStore().exists(managedLedgersPath).join());

final String bundleDataPath = "/loadbalance/bundle-data/" + namespace;
assertFalse(pulsar.getLocalMetadataStore().exists(bundleDataPath).join());
}

@Test
Expand Down