Skip to content
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

[fix][broker] Fix ReplicationDispatch update #16

Merged
merged 1 commit into from
May 27, 2024
Merged

[fix][broker] Fix ReplicationDispatch update #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceGroupsBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,12 @@ protected void internalUpdateResourceGroup(String rgName, ResourceGroup rgConfig
if (rgConfig.getDispatchRateInBytes() != null) {
resourceGroup.setDispatchRateInBytes(rgConfig.getDispatchRateInBytes());
}

if (rgConfig.getReplicationDispatchRateInBytes() != null) {
resourceGroup.setReplicationDispatchRateInBytes(rgConfig.getReplicationDispatchRateInBytes());
}
if (rgConfig.getReplicationDispatchRateInMsgs() != null) {
resourceGroup.setReplicationDispatchRateInMsgs(rgConfig.getReplicationDispatchRateInMsgs());
}
// write back the new ResourceGroup config.
resourceGroupResources().updateResourceGroup(rgName, r -> resourceGroup);
log.info("[{}] Successfully updated the ResourceGroup {}", clientAppId(), rgName);
Expand All @@ -96,6 +101,10 @@ protected void internalCreateResourceGroup(String rgName, ResourceGroup rgConfig
? -1 : rgConfig.getDispatchRateInMsgs());
rgConfig.setDispatchRateInBytes(rgConfig.getDispatchRateInBytes() == null
? -1 : rgConfig.getDispatchRateInBytes());
rgConfig.setReplicationDispatchRateInBytes(rgConfig.getReplicationDispatchRateInBytes() == null
? -1 : rgConfig.getReplicationDispatchRateInBytes());
rgConfig.setReplicationDispatchRateInMsgs(rgConfig.getReplicationDispatchRateInMsgs() == null
? -1 : rgConfig.getReplicationDispatchRateInMsgs());
try {
resourceGroupResources().createResourceGroup(rgName, rgConfig);
log.info("[{}] Created ResourceGroup {}", clientAppId(), rgName);
Expand Down
27 changes: 27 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminResourceGroupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertThrows;
import static org.testng.Assert.assertTrue;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -138,4 +139,30 @@ public void testTopicResourceGroupOverriderNamespaceResourceGroup() throws Pulsa
assertNull(rg);
});
}

@Test
public void testUpdateResourceGroup() throws PulsarAdminException {
String resourceGroupName = "rg-" + UUID.randomUUID();
ResourceGroup resourceGroup = new ResourceGroup();
resourceGroup.setPublishRateInMsgs(1000);
resourceGroup.setPublishRateInBytes(100000L);
resourceGroup.setDispatchRateInMsgs(2000);
resourceGroup.setDispatchRateInBytes(200000L);
resourceGroup.setReplicationDispatchRateInMsgs(10L);
resourceGroup.setReplicationDispatchRateInBytes(20L);

admin.resourcegroups().createResourceGroup(resourceGroupName, resourceGroup);
ResourceGroup got = admin.resourcegroups().getResourceGroup(resourceGroupName);
assertEquals(got, resourceGroup);

resourceGroup.setReplicationDispatchRateInMsgs(11L);
resourceGroup.setReplicationDispatchRateInBytes(29L);
admin.resourcegroups().updateResourceGroup(resourceGroupName, resourceGroup);
got = admin.resourcegroups().getResourceGroup(resourceGroupName);
assertEquals(got, resourceGroup);

admin.resourcegroups().deleteResourceGroup(resourceGroupName);
assertThrows(PulsarAdminException.NotFoundException.class,
() -> admin.resourcegroups().getResourceGroup(resourceGroupName));
}
}
Loading