Skip to content

Fixed the max backoff configuration for lookups #6444

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
merlimat merged 3 commits into from
Mar 3, 2020
Merged

Fixed the max backoff configuration for lookups #6444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18fef6e
Fixed the max backoff configuration for lookups
merlimat Feb 28, 2020
1f3e4fd
Fixed test expectation
merlimat Mar 2, 2020
aa0ddb5
More test fixes
merlimat Mar 2, 2020
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
2 changes: 1 addition & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/BinaryProtoLookupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public CompletableFuture<List<String>> getTopicsUnderNamespace(NamespaceName nam
Backoff backoff = new BackoffBuilder()
.setInitialTime(100, TimeUnit.MILLISECONDS)
.setMandatoryStop(opTimeoutMs.get() * 2, TimeUnit.MILLISECONDS)
.setMax(0, TimeUnit.MILLISECONDS)
.setMax(1, TimeUnit.MINUTES)
.create();
getTopicsUnderNamespace(serviceNameResolver.resolveHost(), namespace, backoff, opTimeoutMs, topicsFuture, mode);
return topicsFuture;
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ public CompletableFuture<PartitionedTopicMetadata> getPartitionedTopicMetadata(S
Backoff backoff = new BackoffBuilder()
.setInitialTime(100, TimeUnit.MILLISECONDS)
.setMandatoryStop(opTimeoutMs.get() * 2, TimeUnit.MILLISECONDS)
.setMax(0, TimeUnit.MILLISECONDS)
.setMax(1, TimeUnit.MINUTES)
.create();
getPartitionedTopicMetadata(topicName, backoff, opTimeoutMs, metadataFuture);
} catch (IllegalArgumentException e) {
Expand Down
2 changes: 1 addition & 1 deletion pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionThrottlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void testInboundConnection() throws Exception {
// OK
}
// should add retry count since retry every 100ms and operation timeout is set to 1000ms
Assert.assertEquals(ProxyService.rejectedConnections.get(), 11.0d);
Assert.assertEquals(ProxyService.rejectedConnections.get(), 5.0d);
}

private static final Logger LOG = LoggerFactory.getLogger(ProxyConnectionThrottlingTest.class);
Expand Down
4 changes: 2 additions & 2 deletions pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyLookupThrottlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void testLookup() throws Exception {
} catch (Exception ex) {
// Ignore
}
Assert.assertEquals(LookupProxyHandler.rejectedPartitionsMetadataRequests.get(), 11.0d);
Assert.assertEquals(LookupProxyHandler.rejectedPartitionsMetadataRequests.get(), 5.0d);
proxyService.getLookupRequestSemaphore().release();
try {
@Cleanup
Expand All @@ -106,6 +106,6 @@ public void testLookup() throws Exception {
Assert.fail("Should not have failed since can acquire LookupRequestSemaphore");
}

Assert.assertEquals(LookupProxyHandler.rejectedPartitionsMetadataRequests.get(), 11.0d);
Assert.assertEquals(LookupProxyHandler.rejectedPartitionsMetadataRequests.get(), 5.0d);
}
}