forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Forget to update memory usage on message send timeout (apache#11761)
### Motivation The producer doesn't release the meomry when msg send timeout ### Modifications When the message timeout, release the memory too. ### Documentation We don't need to update docs, because it's a bug fix. ### reproduce the problem - start pulsar server - start pulsar producer, which will send msg for 10 minutes(queueSize 0, memory limit 50MB) - close the pulsar server - wait for 10 minutes over. - Look the heapdump, it shows pendingMessages size is 0, but Memory used 52429824
- Loading branch information
1 parent
f1d66d1
commit 1399eeb
Showing
2 changed files
with
80 additions
and
0 deletions.
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerMemoryLimitTest.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,79 @@ | ||
/** | ||
* 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.client.impl; | ||
|
||
import lombok.Cleanup; | ||
import org.apache.pulsar.client.api.ProducerConsumerBase; | ||
import org.apache.pulsar.client.api.PulsarClient; | ||
import org.apache.pulsar.client.api.PulsarClientException; | ||
import org.apache.pulsar.client.api.SizeUnit; | ||
import org.testng.Assert; | ||
import org.testng.annotations.AfterMethod; | ||
import org.testng.annotations.BeforeMethod; | ||
import org.testng.annotations.Test; | ||
|
||
import java.nio.charset.StandardCharsets; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
@Test(groups = "broker-impl") | ||
public class ProducerMemoryLimitTest extends ProducerConsumerBase { | ||
|
||
@Override | ||
@BeforeMethod | ||
protected void setup() throws Exception { | ||
super.internalSetup(); | ||
super.producerBaseSetup(); | ||
} | ||
|
||
@Override | ||
@AfterMethod(alwaysRun = true) | ||
protected void cleanup() throws Exception { | ||
super.internalCleanup(); | ||
} | ||
|
||
@Test(timeOut = 10_000) | ||
public void testProducerTimeoutMemoryRelease() throws Exception { | ||
initClientWithMemoryLimit(); | ||
@Cleanup | ||
ProducerImpl<byte[]> producer = (ProducerImpl<byte[]>) pulsarClient.newProducer() | ||
.topic("testProducerMemoryLimit") | ||
.sendTimeout(5, TimeUnit.SECONDS) | ||
.maxPendingMessages(0) | ||
.enableBatching(false) | ||
.create(); | ||
this.stopBroker(); | ||
try { | ||
producer.send("memroy-test".getBytes(StandardCharsets.UTF_8)); | ||
throw new IllegalStateException("can not reach here"); | ||
} catch (PulsarClientException.TimeoutException ex) { | ||
PulsarClientImpl clientImpl = (PulsarClientImpl) this.pulsarClient; | ||
final MemoryLimitController memoryLimitController = clientImpl.getMemoryLimitController(); | ||
Assert.assertEquals(memoryLimitController.currentUsage(), 0); | ||
} | ||
|
||
} | ||
|
||
private void initClientWithMemoryLimit() throws PulsarClientException { | ||
pulsarClient = PulsarClient.builder(). | ||
serviceUrl(lookupUrl.toString()) | ||
.memoryLimit(50, SizeUnit.KILO_BYTES) | ||
.build(); | ||
} | ||
|
||
} |
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