Skip to content

[Issue 11153] [pulsar-broker] Fix for missing metadata-store watch events #11157

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

Closed
bharanic-dev wants to merge 2 commits into from
Closed

[Issue 11153] [pulsar-broker] Fix for missing metadata-store watch events #11157

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
e518245
Add a unit test to test repeated updates of resource-group.
Jun 29, 2021
c611b6e
Fix the race condition in metadata-store:
Jun 29, 2021
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
50 changes: 50 additions & 0 deletions ...src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@
*/
package org.apache.pulsar.broker.resourcegroup;

import static org.apache.pulsar.broker.cache.ConfigurationCacheService.RESOURCEGROUPS;
import static org.apache.pulsar.common.policies.path.PolicyPath.path;
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 com.google.common.collect.Sets;
import java.util.Random;

import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.common.policies.data.ClusterData;
Expand All @@ -34,6 +38,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

@Slf4j
public class ResourceGroupConfigListenerTest extends MockedPulsarServiceBaseTest {

ResourceGroup testAddRg = new ResourceGroup();
Expand Down Expand Up @@ -166,6 +171,51 @@ public void testResourceGroupCreateMany() throws Exception {
});
}

@Test
public void testResourceGroupUpdateLoop() throws PulsarAdminException {

ResourceGroup zooRg = new ResourceGroup();
pulsar.getPulsarResources().getResourcegroupResources().getStore().registerListener(
notification -> {
String notifyPath = notification.getPath();
String rgName = notifyPath.substring(notifyPath.lastIndexOf('/') + 1);
if (!notifyPath.startsWith(path(RESOURCEGROUPS))) {
return;
}
if (RESOURCEGROUPS.equals(rgName)) {
return;
}
pulsar.getPulsarResources().getResourcegroupResources()
.getAsync(notifyPath).whenComplete((optionalRg, ex) -> {
if (ex != null) {
return;
}
if (optionalRg.isPresent()) {
ResourceGroup resourceGroup = optionalRg.get();

zooRg.setDispatchRateInBytes(resourceGroup.getDispatchRateInBytes());
zooRg.setDispatchRateInMsgs(resourceGroup.getDispatchRateInMsgs());
zooRg.setPublishRateInBytes(resourceGroup.getPublishRateInBytes());
zooRg.setPublishRateInMsgs(resourceGroup.getPublishRateInMsgs());
}
});
}
);
ResourceGroup rg = new ResourceGroup();
rg.setPublishRateInMsgs(-1);
rg.setPublishRateInBytes(10);
rg.setDispatchRateInMsgs(10);
rg.setDispatchRateInBytes(20);
createResourceGroup("myrg", rg);

for (int i = 0; i < 1000; i++) {
rg.setPublishRateInMsgs(i);
updateResourceGroup("myrg", rg);
}

Awaitility.await().untilAsserted(() -> assertEquals(zooRg.getPublishRateInMsgs(), rg.getPublishRateInMsgs()));
}

private void prepareData() throws PulsarAdminException {
admin.clusters().createCluster(clusterName, ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());

Expand Down
8 changes: 4 additions & 4 deletions pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/MetadataCacheImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ public CompletableFuture<T> readModifyUpdateOrCreate(String path, Function<Optio

return store.put(path, newValue, Optional.of(expectedVersion)).thenAccept(stat -> {
// Make sure we have the value cached before the operation is completed
objCache.put(path,
FutureUtils.value(Optional.of(new CacheGetResult<>(newValueObj, stat))));
//objCache.put(path,
// FutureUtils.value(Optional.of(new CacheGetResult<>(newValueObj, stat))));
}).thenApply(__ -> newValueObj);
}), path);
}
Expand Down Expand Up @@ -192,8 +192,8 @@ public CompletableFuture<T> readModifyUpdate(String path, Function<T, T> modifyF

return store.put(path, newValue, Optional.of(expectedVersion)).thenAccept(stat -> {
// Make sure we have the value cached before the operation is completed
objCache.put(path,
FutureUtils.value(Optional.of(new CacheGetResult<>(newValueObj, stat))));
//objCache.put(path,
// FutureUtils.value(Optional.of(new CacheGetResult<>(newValueObj, stat))));
}).thenApply(__ -> newValueObj);
}), path);
}
Expand Down