forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix][broker] Fix ResourceGroup report local usage (apache#22340)
Signed-off-by: Zixuan Liu <[email protected]> (cherry picked from commit 0b2b6d5)
- Loading branch information
Showing
3 changed files
with
130 additions
and
17 deletions.
There are no files selected for viewing
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
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
105 changes: 105 additions & 0 deletions
105
...c/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupReportLocalUsageTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.pulsar.broker.resourcegroup; | ||
|
|
||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.assertFalse; | ||
| import static org.testng.Assert.assertTrue; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; | ||
| import org.apache.pulsar.broker.resourcegroup.ResourceGroup.BytesAndMessagesCount; | ||
| import org.apache.pulsar.broker.resourcegroup.ResourceGroup.PerMonitoringClassFields; | ||
| import org.apache.pulsar.broker.resourcegroup.ResourceGroup.ResourceGroupMonitoringClass; | ||
| import org.apache.pulsar.broker.service.resource.usage.ResourceUsage; | ||
| import org.apache.pulsar.common.policies.data.ResourceGroup; | ||
| import org.testng.annotations.AfterClass; | ||
| import org.testng.annotations.BeforeClass; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class ResourceGroupReportLocalUsageTest extends MockedPulsarServiceBaseTest { | ||
|
|
||
| @BeforeClass | ||
| @Override | ||
| protected void setup() throws Exception { | ||
| super.internalSetup(); | ||
| } | ||
|
|
||
| @AfterClass(alwaysRun = true) | ||
| @Override | ||
| protected void cleanup() throws Exception { | ||
| super.internalCleanup(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testRgFillResourceUsage() throws Exception { | ||
| pulsar.getResourceGroupServiceManager().close(); | ||
| AtomicBoolean needReport = new AtomicBoolean(false); | ||
| ResourceGroupService service = new ResourceGroupService(pulsar, TimeUnit.HOURS, null, | ||
| new ResourceQuotaCalculator() { | ||
| @Override | ||
| public boolean needToReportLocalUsage(long currentBytesUsed, long lastReportedBytes, | ||
| long currentMessagesUsed, long lastReportedMessages, | ||
| long lastReportTimeMSecsSinceEpoch) { | ||
| return needReport.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public long computeLocalQuota(long confUsage, long myUsage, long[] allUsages) { | ||
| return 0; | ||
| } | ||
| }); | ||
| String rgName = "rg-1"; | ||
| ResourceGroup rgConfig = new ResourceGroup(); | ||
| rgConfig.setPublishRateInBytes(1000L); | ||
| rgConfig.setPublishRateInMsgs(2000); | ||
| service.resourceGroupCreate(rgName, rgConfig); | ||
|
|
||
| org.apache.pulsar.broker.resourcegroup.ResourceGroup resourceGroup = service.resourceGroupGet(rgName); | ||
| BytesAndMessagesCount bytesAndMessagesCount = new BytesAndMessagesCount(); | ||
| bytesAndMessagesCount.bytes = 20; | ||
| bytesAndMessagesCount.messages = 10; | ||
| resourceGroup.incrementLocalUsageStats(ResourceGroupMonitoringClass.Publish, bytesAndMessagesCount); | ||
| ResourceUsage resourceUsage = new ResourceUsage(); | ||
| resourceGroup.rgFillResourceUsage(resourceUsage); | ||
| assertFalse(resourceUsage.hasDispatch()); | ||
| assertFalse(resourceUsage.hasPublish()); | ||
|
|
||
| PerMonitoringClassFields publishMonitoredEntity = | ||
| resourceGroup.getMonitoredEntity(ResourceGroupMonitoringClass.Publish); | ||
| assertEquals(publishMonitoredEntity.usedLocallySinceLastReport.messages, bytesAndMessagesCount.messages); | ||
| assertEquals(publishMonitoredEntity.usedLocallySinceLastReport.bytes, bytesAndMessagesCount.bytes); | ||
| assertEquals(publishMonitoredEntity.totalUsedLocally.messages, 0); | ||
| assertEquals(publishMonitoredEntity.totalUsedLocally.bytes, 0); | ||
| assertEquals(publishMonitoredEntity.lastReportedValues.messages, 0); | ||
| assertEquals(publishMonitoredEntity.lastReportedValues.bytes, 0); | ||
|
|
||
| needReport.set(true); | ||
| resourceGroup.rgFillResourceUsage(resourceUsage); | ||
| assertTrue(resourceUsage.hasDispatch()); | ||
| assertTrue(resourceUsage.hasPublish()); | ||
| assertEquals(publishMonitoredEntity.usedLocallySinceLastReport.messages, 0); | ||
| assertEquals(publishMonitoredEntity.usedLocallySinceLastReport.bytes, 0); | ||
| assertEquals(publishMonitoredEntity.totalUsedLocally.messages, bytesAndMessagesCount.messages); | ||
| assertEquals(publishMonitoredEntity.totalUsedLocally.bytes, bytesAndMessagesCount.bytes); | ||
| assertEquals(publishMonitoredEntity.lastReportedValues.messages, bytesAndMessagesCount.messages); | ||
| assertEquals(publishMonitoredEntity.lastReportedValues.bytes, bytesAndMessagesCount.bytes); | ||
| } | ||
| } |