[improve][broker] PIP-192 updated metrics and cleanup broker selector #19945
+212
−159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heesung-sn
force-pushed
the
pip-192-update-metrics
branch
from
92a9f59 to
131868d
Compare
|
Raised a load-balance dashboard PR here. streamnative/apache-pulsar-grafana-dashboard#93 |
heesung-sn
force-pushed
the
pip-192-update-metrics
branch
from
131868d to
05d3e4b
Compare
gaoran10
reviewed
Mar 30, 2023
| Optional<String> selectedBroker = brokerSelector.select(availableBrokers, null, context); | ||
| private Optional<String> selectBroker(String serviceUnit) { | ||
| var namespaceBundle = getNamespaceBundle(serviceUnit); | ||
| if (namespaceBundle.getNamespaceObject().equals(SYSTEM_NAMESPACE)) { |
There was a problem hiding this comment.
Why need to skip bundles of the system namespace? I found the method ExtensibleLoadManagerImpl#assign will ignore some internal topics and use the channel owner as the owner broker.
There was a problem hiding this comment.
Nice catch. We shouldn't. Updated.
| private final PulsarService pulsar; | ||
| private final ServiceConfiguration config; | ||
| private final Schema<ServiceUnitStateData> schema; | ||
| private final ConcurrentOpenHashMap<String, CompletableFuture<String>> getOwnerRequests; | ||
| private final String lookupServiceAddress; | ||
| private final ConcurrentOpenHashMap<String, CompletableFuture<Void>> cleanupJobs; | ||
| private final StateChangeListeners stateChangeListeners; | ||
| private BrokerSelectionStrategy brokerSelector; | ||
| private ExtensibleLoadManagerImpl brokerSelector; |
There was a problem hiding this comment.
We should change the field name.
| @@ -329,9 +337,9 @@ protected LoadManagerContext getContext() { | |||
| } | |||
|
|
|||
| @VisibleForTesting | |||
| protected BrokerSelectionStrategy getBrokerSelector() { | |||
| protected ExtensibleLoadManagerImpl getBrokerSelector() { | |||
There was a problem hiding this comment.
Same as the previous comment.
| + " This broker is not the owner.", bundle)); | ||
| counter.update(Failure, Unknown); |
There was a problem hiding this comment.
Do we need update counter?
There was a problem hiding this comment.
No. This can happen a lot, and we don't want to add noise in failure count.
|
@gaoran10 @Demogorgon314 PTAL by any chance. |
| @@ -465,7 +472,7 @@ public CompletableFuture<Optional<String>> getOwnerAsync(String serviceUnit) { | |||
|
|
|||
| ServiceUnitStateData data = tableview.get(serviceUnit); | |||
| ServiceUnitState state = state(data); | |||
| ownerLookUpCounters.get(state).incrementAndGet(); | |||
| ownerLookUpCounters.get(state).total.incrementAndGet(); | |||
There was a problem hiding this comment.
Suggested change
| ownerLookUpCounters.get(state).total.incrementAndGet(); | |
| ownerLookUpCounters.get(state).getTotal().incrementAndGet(); |
| return deferGetOwnerRequest(serviceUnit).thenApply( | ||
| return deferGetOwnerRequest(serviceUnit).whenComplete((__, e) -> { | ||
| if (e != null) { | ||
| ownerLookUpCounters.get(state).failure.incrementAndGet(); |
There was a problem hiding this comment.
Suggested change
| ownerLookUpCounters.get(state).failure.incrementAndGet(); | |
| ownerLookUpCounters.get(state).getFailure().incrementAndGet(); |
| broker -> broker == null ? Optional.empty() : Optional.of(broker)); | ||
| } | ||
| case Init, Free -> { | ||
| return CompletableFuture.completedFuture(Optional.empty()); | ||
| } | ||
| case Deleted -> { | ||
| ownerLookUpCounters.get(state).failure.incrementAndGet(); |
There was a problem hiding this comment.
Suggested change
| ownerLookUpCounters.get(state).failure.incrementAndGet(); | |
| ownerLookUpCounters.get(state).getFailure().incrementAndGet(); |
| return CompletableFuture.failedFuture(new IllegalArgumentException(serviceUnit + " is deleted.")); | ||
| } | ||
| default -> { | ||
| ownerLookUpCounters.get(state).failure.incrementAndGet(); |
There was a problem hiding this comment.
Suggested change
| ownerLookUpCounters.get(state).failure.incrementAndGet(); | |
| ownerLookUpCounters.get(state).getFailure().incrementAndGet(); |
Demogorgon314
approved these changes
Apr 3, 2023
|
@gaoran10 @Technoboy- PTAL by any chance. |
gaoran10
approved these changes
Apr 4, 2023
2 tasks
|
/pulsarbot rerun-failure-checks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Master Issue: #16691
Motivation
Raising a PR to implement: #16691
Modifications
This PR
OverrideEventType metricsVerifying this change
This change added tests and can be verified as follows:
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
docdoc-requireddoc-not-neededdoc-completeWe will have separate PRs to update the Doc later.
Matching PR in forked repository
PR in forked repository: heesung-sn#40