You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2020/04/20 16:00:39 UTC
[GitHub] [pulsar] srkukarni opened a new pull request #6778: Ensure that all dangling consumers are cleaned up during failures
srkukarni opened a new pull request #6778:
URL: https://github.com/apache/pulsar/pull/6778
<!--
### Contribution Checklist
- Name the pull request in the form "[Issue XYZ][component] Title of the pull request", where *XYZ* should be replaced by the actual issue number.
Skip *Issue XYZ* if there is no associated github issue for this pull request.
Skip *component* if you are unsure about which is the best component. E.g. `[docs] Fix typo in produce method`.
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Each pull request should address only one issue, not mix up code from multiple issues.
- Each commit in the pull request has a meaningful commit message
- Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below.
**(The sections below can be removed for hotfixes of typos)**
-->
*(If this PR fixes a github issue, please add `Fixes #<xyz>`.)*
Fixes #<xyz>
*(or if this PR is one task of a github issue, please add `Master Issue: #<xyz>` to link to the master issue.)*
Master Issue: #<xyz>
### Motivation
In PulsarSource::open, if the sourcespec has multiple topics and if there is an exception creating a consumer for any one of them, the inputConsumers list is not initialized with those consumers who were successful. This means that subsequent close method doesn't cleanup those consumers leaving dangling consumers. This mr fixes that logic
### Modifications
*Describe the modifications you've done.*
### Verifying this change
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Does this pull request potentially affect one of the following parts:
*If `yes` was chosen, please highlight the changes*
- Dependencies (does it add or upgrade a dependency): (yes / no)
- The public API: (yes / no)
- The schema: (yes / no / don't know)
- The default values of configurations: (yes / no)
- The wire protocol: (yes / no)
- The rest endpoints: (yes / no)
- The admin cli options: (yes / no)
- Anything that affects deployment: (yes / no / don't know)
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a followup issue for adding the documentation
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] merlimat commented on a change in pull request #6778: Ensure that all dangling consumers are cleaned up during failures
Posted by GitBox <gi...@apache.org>.
merlimat commented on a change in pull request #6778:
URL: https://github.com/apache/pulsar/pull/6778#discussion_r411506170
##########
File path: pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
##########
@@ -80,17 +80,17 @@ public void open(Map<String, Object> config, SourceContext sourceContext) throws
.messageListener(this);
if (conf.isRegexPattern) {
- cb.topicsPattern(topic);
+ cb = cb.topicsPattern(topic);
Review comment:
The assignment is not needed, the builder would update in-place
##########
File path: pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
##########
@@ -99,11 +99,12 @@ public void open(Map<String, Object> config, SourceContext sourceContext) throws
if (pulsarSourceConfig.getDeadLetterTopic() != null && !pulsarSourceConfig.getDeadLetterTopic().isEmpty()) {
deadLetterPolicyBuilder.deadLetterTopic(pulsarSourceConfig.getDeadLetterTopic());
}
- cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
+ cb = cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
}
- return cb.subscribeAsync();
- }).collect(Collectors.toList()).stream().map(CompletableFuture::join).collect(Collectors.toList());
+ Consumer<T> consumer = cb.subscribeAsync().join();
Review comment:
This could be simplified into:
```suggestion
Consumer<T> consumer = cb.subscribe();
```
In any case, I think we should be catching any exception thrown over the loop and close down all the consumers that were already created and added to the list.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] srkukarni commented on a change in pull request #6778: Ensure that all dangling consumers are cleaned up during failures
Posted by GitBox <gi...@apache.org>.
srkukarni commented on a change in pull request #6778:
URL: https://github.com/apache/pulsar/pull/6778#discussion_r411602963
##########
File path: pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
##########
@@ -80,17 +80,17 @@ public void open(Map<String, Object> config, SourceContext sourceContext) throws
.messageListener(this);
if (conf.isRegexPattern) {
- cb.topicsPattern(topic);
+ cb = cb.topicsPattern(topic);
Review comment:
This is needed for test, since otherwise the mock would return null
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] srkukarni commented on a change in pull request #6778: Ensure that all dangling consumers are cleaned up during failures
Posted by GitBox <gi...@apache.org>.
srkukarni commented on a change in pull request #6778:
URL: https://github.com/apache/pulsar/pull/6778#discussion_r411603731
##########
File path: pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
##########
@@ -99,11 +99,12 @@ public void open(Map<String, Object> config, SourceContext sourceContext) throws
if (pulsarSourceConfig.getDeadLetterTopic() != null && !pulsarSourceConfig.getDeadLetterTopic().isEmpty()) {
deadLetterPolicyBuilder.deadLetterTopic(pulsarSourceConfig.getDeadLetterTopic());
}
- cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
+ cb = cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
}
- return cb.subscribeAsync();
- }).collect(Collectors.toList()).stream().map(CompletableFuture::join).collect(Collectors.toList());
+ Consumer<T> consumer = cb.subscribeAsync().join();
Review comment:
The current philosophy is that all cleaning up logic is inside the close which will get called as soon as there is an error. Shouldn't that suffice?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] merlimat commented on a change in pull request #6778: Ensure that all dangling consumers are cleaned up during failures
Posted by GitBox <gi...@apache.org>.
merlimat commented on a change in pull request #6778:
URL: https://github.com/apache/pulsar/pull/6778#discussion_r412599838
##########
File path: pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
##########
@@ -99,11 +99,12 @@ public void open(Map<String, Object> config, SourceContext sourceContext) throws
if (pulsarSourceConfig.getDeadLetterTopic() != null && !pulsarSourceConfig.getDeadLetterTopic().isEmpty()) {
deadLetterPolicyBuilder.deadLetterTopic(pulsarSourceConfig.getDeadLetterTopic());
}
- cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
+ cb = cb.deadLetterPolicy(deadLetterPolicyBuilder.build());
}
- return cb.subscribeAsync();
- }).collect(Collectors.toList()).stream().map(CompletableFuture::join).collect(Collectors.toList());
+ Consumer<T> consumer = cb.subscribeAsync().join();
Review comment:
The client close? What wouldn't work when running in the thread mode, since the `PulsarClient` is shared.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org