Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.mqtt.MqttMessage;
import io.netty.handler.codec.mqtt.MqttMessageType;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import java.util.Objects;
Expand Down Expand Up @@ -100,6 +101,8 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
getLocal(OversizePacketDropped.class)
.mqttPacketType(mqttMessage.fixedHeader().messageType().value())
.clientInfo(clientInfo));
ReferenceCountUtil.release(msg);
promise.setSuccess();
}

private GenericFutureListener<? extends Future<? super Void>> logMetric(MqttMessage message, int size) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;

import org.apache.bifromq.metrics.ITenantMeter;
import org.apache.bifromq.metrics.TenantMetric;
Expand All @@ -43,14 +44,18 @@
import org.apache.bifromq.plugin.settingprovider.Setting;
import org.apache.bifromq.type.ClientInfo;
import io.micrometer.core.instrument.Timer;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelPromise;
import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.handler.codec.mqtt.MqttMessage;
import io.netty.handler.codec.mqtt.MqttMessageBuilders;
import io.netty.handler.codec.mqtt.MqttProperties;
import io.netty.handler.codec.mqtt.MqttPubReplyMessageVariableHeader;
import io.netty.handler.codec.mqtt.MqttPublishMessage;
import io.netty.handler.codec.mqtt.MqttQoS;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.testng.annotations.Test;
Expand Down Expand Up @@ -201,4 +206,37 @@ public void dropUntrimableMessage() {
assertNull(channel.readOutbound());
}
}

@Test
public void mqtt5DropUntrimablePublishReleasesPayloadAndCompletesPromise() {
try (MockedStatic<ITenantMeter> mockedStatic = mockStatic(ITenantMeter.class)) {
mockedStatic.when(() -> ITenantMeter.get(tenantId)).thenReturn(tenantMeter);
when(tenantMeter.timer(any())).thenReturn(timer);
MQTTPacketFilter testFilter =
new MQTTPacketFilter(108, settings, mqtt5Client, eventCollector);
EmbeddedChannel channel = new EmbeddedChannel(testFilter);
MqttProperties props = new MqttProperties();
props.add(new MqttProperties.UserProperties(List.of(new MqttProperties.StringPair("key", "val"))));
props.add(new MqttProperties.StringProperty(MqttProperties.MqttPropertyType.REASON_STRING.value(),
"11111111111"));

MqttPublishMessage largeMessage = MqttMessageBuilders.publish()
.topicName("topic")
.qos(MqttQoS.AT_MOST_ONCE)
.payload(Unpooled.wrappedBuffer(new byte[100]))
.properties(props)
.build();
ByteBuf payload = largeMessage.payload();
ChannelPromise promise = channel.newPromise();
AtomicBoolean completionListenerCalled = new AtomicBoolean();
promise.addListener(ignored -> completionListenerCalled.set(true));
channel.writeAndFlush(largeMessage, promise);
verify(tenantMeter, never()).recordSummary(eq(TenantMetric.MqttEgressBytes), anyDouble());
verify(eventCollector).report(argThat(e -> e instanceof OversizePacketDropped));
assertNull(channel.readOutbound());
assertTrue(promise.isSuccess());
assertTrue(completionListenerCalled.get());
assertEquals(payload.refCnt(), 0);
}
}
}
Loading