Skip to content

[fix][broker] BadVersionException when splitting bundles, delay 100ms and try again. #16612

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
Jul 18, 2022
Merged

[fix][broker] BadVersionException when splitting bundles, delay 100ms and try again. #16612

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
6 changes: 4 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.pulsar.common.naming.NamespaceName.SYSTEM_NAMESPACE;
Expand Down Expand Up @@ -899,9 +900,10 @@ void splitAndOwnBundleOnceAndRetry(NamespaceBundle bundle,
// retry several times on BadVersion
if ((t.getCause() instanceof MetadataStoreException.BadVersionException)
&& (counter.decrementAndGet() >= 0)) {
pulsar.getOrderedExecutor()
pulsar.getExecutor().schedule(() -> pulsar.getOrderedExecutor()
.execute(() -> splitAndOwnBundleOnceAndRetry(
bundle, unload, counter, completionFuture, splitAlgorithm, boundaries));
bundle, unload, counter, completionFuture, splitAlgorithm, boundaries)),
100, MILLISECONDS);
} else if (t instanceof IllegalArgumentException) {
completionFuture.completeExceptionally(t);
} else {
Expand Down
6 changes: 3 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,7 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
try {
admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false, null);
} catch (Exception e) {
fail("split bundle shouldn't have thrown exception");
fail("split bundle shouldn't have thrown exception", e);
}

// bundle-factory cache must have updated split bundles
Expand Down Expand Up @@ -1745,7 +1745,7 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
f.get();
}
} catch (Exception e) {
fail("split bundle shouldn't have thrown exception");
fail("split bundle shouldn't have thrown exception", e);
}

Awaitility.await().untilAsserted(() ->
Expand Down Expand Up @@ -1780,7 +1780,7 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
f.get();
}
} catch (Exception e) {
fail("split bundle shouldn't have thrown exception");
fail("split bundle shouldn't have thrown exception", e);
}
Awaitility.await().untilAsserted(() ->
assertEquals(bundleFactory.getBundles(NamespaceName.get(namespace)).getBundles().size(), 8));
Expand Down