Skip to content

[fix][broker] Fix ResourceGroup report local usage#22340

Merged
nodece merged 1 commit into
apache:masterfrom
nodece:fix-resource-report-local-usage
Mar 26, 2024
Merged

[fix][broker] Fix ResourceGroup report local usage#22340
nodece merged 1 commit into
apache:masterfrom
nodece:fix-resource-report-local-usage

Conversation

@nodece

@nodece nodece commented Mar 25, 2024

Copy link
Copy Markdown
Member

Motivation

  1. org.apache.pulsar.broker.resourcegroup.ResourceQuotaCalculator#needToReportLocalUsage determine whether sending the current report of local usage can be suppressed (to reduce network communication), when returns true, we need to report the local usage to resourcegroup topic and reset some status, but now we always reset that, please see https://github.com/apache/pulsar/blob/v3.0.3/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroup.java#L452-L457

  2. Now the maxIntervalForSuppressingReportsMSecs is in seconds, and is used to comparing with milliseconds, so the local usage is always reported, please see https://github.com/apache/pulsar/blob/v3.0.3/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImpl.java#L99-L103

Modifications

  • Reset the usedLocallySinceLastReport, totalUsedLocally, lastResourceUsageFillTimeMSecsSinceEpoch after needToReportLocalUsage returns true.
  • Covert maxIntervalForSuppressingReportsMSecs to milliseconds from seconds.

Documentation

  • doc
  • doc-required
  • doc-not-needed
  • doc-complete

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
@github-actions github-actions Bot added the doc-not-needed Your PR changes do not impact docs label Mar 25, 2024

@lhotari lhotari left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nodece

nodece commented Mar 25, 2024

Copy link
Copy Markdown
Member Author

/pulsarbot rerun-failure-checks

@nodece nodece self-assigned this Mar 26, 2024
@nodece nodece added this to the 3.3.0 milestone Mar 26, 2024
@nodece nodece merged commit 0b2b6d5 into apache:master Mar 26, 2024
@nodece nodece added the type/bug The PR fixed a bug or issue reported a bug label Mar 26, 2024
nodece added a commit that referenced this pull request Mar 26, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
nodece added a commit that referenced this pull request Mar 26, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
nodece added a commit that referenced this pull request Mar 26, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
nodece added a commit that referenced this pull request Mar 26, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
nikhil-ctds pushed a commit to datastax/pulsar that referenced this pull request Apr 3, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
(cherry picked from commit 2481cd8)
nikhil-ctds pushed a commit to datastax/pulsar that referenced this pull request Apr 4, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
(cherry picked from commit 2481cd8)
nodece added a commit to ascentstream/pulsar that referenced this pull request May 13, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
nodece added a commit to ascentstream/pulsar that referenced this pull request May 15, 2024
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 0b2b6d5)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
hanmz pushed a commit to hanmz/pulsar that referenced this pull request Feb 12, 2025
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants