Skip to content

[fix][broker] Fix executeWithRetry result is null #17694

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
codelipenghui merged 1 commit into from
Oct 11, 2022
Merged

[fix][broker] Fix executeWithRetry result is null #17694

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
4 changes: 2 additions & 2 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 @@ -294,12 +294,12 @@ public void accept(Notification t) {

private CompletableFuture<T> executeWithRetry(Supplier<CompletableFuture<T>> op, String key) {
CompletableFuture<T> result = new CompletableFuture<>();
op.get().thenAccept(r -> result.complete(r)).exceptionally((ex) -> {
op.get().thenAccept(result::complete).exceptionally((ex) -> {
if (ex.getCause() instanceof BadVersionException) {
// if resource is updated by other than metadata-cache then metadata-cache will get bad-version
// exception. so, try to invalidate the cache and try one more time.
objCache.synchronous().invalidate(key);
op.get().thenAccept((c) -> result.complete(null)).exceptionally((ex1) -> {
op.get().thenAccept(result::complete).exceptionally((ex1) -> {
result.completeExceptionally(ex1.getCause());
return null;
});
Expand Down
16 changes: 11 additions & 5 deletions pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,15 +491,21 @@ public void readModifyUpdateBadVersionRetry() throws Exception {

MyClass value1 = new MyClass("a", 1);
objCache1.create(key1, value1).join();
objCache1.get(key1).join();
assertEquals(objCache1.get(key1).join().get().b, 1);

objCache2.readModifyUpdate(key1, v -> {
CompletableFuture<MyClass> future1 = objCache1.readModifyUpdate(key1, v -> {
return new MyClass(v.a, v.b + 1);
}).join();
});

objCache1.readModifyUpdate(key1, v -> {
CompletableFuture<MyClass> future2 = objCache2.readModifyUpdate(key1, v -> {
return new MyClass(v.a, v.b + 1);
}).join();
});

MyClass myClass1 = future1.join();
assertEquals(myClass1.b, 2);

MyClass myClass2 = future2.join();
assertEquals(myClass2.b, 3);
}

@Test(dataProvider = "impl")
Expand Down