[fix][broker] Fix resource_quota_zpath

[AnonHxy]

Motivation

Fix the resource_quota_zpath in LoadSimulationController and ModularLoadManagerImpl.

As we can see from the BundlesQuotas(line30) that the resource_quota_zpath should be /loadbalance/resource-quota, not /loadbalance/resource-quota/namespace. so here we fix it.

pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java

Lines 30 to 32 in e55de39

	private static final String RESOURCE_QUOTA_ROOT = "/loadbalance/resource-quota";
	private static final String DEFAULT_RESOURCE_QUOTA_PATH = RESOURCE_QUOTA_ROOT + "/default";

Modifications

Fix resource_quota_zpath

Verifying this change

• Make sure that the change passes the CI checks.

Documentation

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

Matching PR in forked repository

AnonHxy#47

[codecov-commenter]

Codecov Report

Merging #21461 (fa6e995) into master (e55de39) will increase coverage by 0.15%.
Report is 36 commits behind head on master.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master   #21461      +/-   ##
============================================
+ Coverage     73.14%   73.30%   +0.15%     
- Complexity    32570    32675     +105     
============================================
  Files          1890     1892       +2     
  Lines        140357   140632     +275     
  Branches      15425    15467      +42     
============================================
+ Hits         102663   103088     +425     
+ Misses        29595    29455     -140     
+ Partials       8099     8089      -10     

Flag	Coverage Δ
inttests	24.21% <ø> (?)
systests	24.75% <ø> (+0.03%)	⬆️
unittests	72.57% <ø> (+0.03%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...roker/loadbalance/impl/ModularLoadManagerImpl.java	84.70% <ø> (+2.79%)	⬆️

... and 135 files with indirect coverage changes

[liudezhi2098]

This will lead to incompatibility between versions.

[AnonHxy]

Hi @liudezhi2098 . This patch will not lead incompatible issue I think:

1. Resource quotas are written to /loadbalance/resource-quota only by BundlesQuotas.

pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java

Lines 61 to 65 in bc84721

	public CompletableFuture<Void> setResourceQuota(String bundle, ResourceQuota quota) {
	return resourceQuotaCache.readModifyUpdateOrCreate(RESOURCE_QUOTA_ROOT + "/" + bundle,
	__ -> quota)
	.thenApply(__ -> null);
	}

2. ModularLoadManagerImpl only read the zpath specified by RESOURCE_QUOTA_ZPATH=/loadbalance/resource-quota/namespace. Currently the read result should always be empty because the zpath is wrong.

pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java

Lines 384 to 387 in bc84721

	Optional<ResourceQuota> optQuota = resourceQuotaCache
	.get(String.format("%s/%s", RESOURCE_QUOTA_ZPATH, bundle)).join();
	if (optQuota.isPresent()) {
	ResourceQuota quota = optQuota.get();

3. And the LoadSimulationController should be used for test. We needn't care about it's incompatibility

[AnonHxy]

@HQebupt @congbobo184 @Technoboy- @codelipenghui PTAL. thanks:)

[Technoboy-]

We'd better make BundlesQuotas#DEFAULT_RESOURCE_QUOTA_PATH to public, and remove them from ModularLoadManagerImpl/LoadSimulationController

[AnonHxy]

We'd better make BundlesQuotas#DEFAULT_RESOURCE_QUOTA_PATH to public, and remove them from ModularLoadManagerImpl/LoadSimulationController

@Technoboy- Good idea. PIP-301 #21129 is going to refactor this and will make it public. I think we could just correct the zpath here and make it to public in another PR when implements PIP-301

[BewareMyPower]

Is there any test that could cover it?

[codelipenghui]

@AnonHxy Could you please help add a test to cover this fix? And from the description, I still don't know what is the impact here. Is it something that doesn't work? how to reproduce it?

[AnonHxy]

Hi @codelipenghui @poorbarcode @BewareMyPower Is there any other comments:)

[poorbarcode]

This test sets the default bundle resource quota by Pulsar Admin V1 API, could you also add a case for Pulsar Admin V2 API?

[AnonHxy]

Done @poorbarcode