Skip to content

Fix duplicate local delivery results by prioritizing NO_RECEIVER #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
popduke merged 1 commit into from
Aug 28, 2026
Merged

Fix duplicate local delivery results by prioritizing NO_RECEIVER #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...t/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalDistService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ public CompletableFuture<DeliveryReply> dist(DeliveryRequest request) {
tenantMeter.recordSummary(MqttTransientFanOutBytes, totalFanOutBytes);
// don't include duplicated matchInfo in the result
// treat skip as ok
noSub.removeAll(noReceiver);
Sets.difference(Sets.union(ok, skip), Sets.union(noSub, noReceiver)).forEach(matchInfo ->
resultsBuilder.addResult(
DeliveryResult.newBuilder().setMatchInfo(matchInfo).setCode(DeliveryResult.Code.OK).build()));
Expand Down
46 changes: 46 additions & 0 deletions ...fromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalDistServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,52 @@ public void deliverToNoLocalRoute() {
assertEquals(result.getCode(), DeliveryResult.Code.NO_RECEIVER);
}

@Test
public void noReceiverWinsNoSubAcrossDeliveryPacksRegardlessOfOrder() {
String noSubFirstTenantId = "noSubFirst";
String noReceiverFirstTenantId = "noReceiverFirst";
String topicFilter = "testTopic/#";
String channelId = "channel0";
MatchInfo matchInfo = MatchInfo.newBuilder()
.setMatcher(TopicUtil.from(topicFilter))
.setReceiverId("receiverId")
.build();
DeliveryPack deliveryPack = DeliveryPack.newBuilder()
.setMessagePack(TopicMessagePack.newBuilder().setTopic("testTopic").build())
.addMatchInfo(matchInfo)
.build();
DeliveryPackage deliveryPackage = DeliveryPackage.newBuilder()
.addPack(deliveryPack)
.addPack(deliveryPack)
.build();
DeliveryRequest request = DeliveryRequest.newBuilder()
.putPackage(noSubFirstTenantId, deliveryPackage)
.putPackage(noReceiverFirstTenantId, deliveryPackage)
.build();

IMQTTTransientSession session = mock(IMQTTTransientSession.class);
when(session.publish(any(), any())).thenAnswer(invocation -> invocation.getArgument(1));
when(localSessionRegistry.get(channelId)).thenReturn(session);
ILocalTopicRouter.ILocalRoutes localRoutes = mock(ILocalTopicRouter.ILocalRoutes.class);
when(localRoutes.localReceiverId()).thenReturn("receiverId");
when(localRoutes.routesInfo()).thenReturn(Map.of(channelId, 1L));
when(localTopicRouter.getTopicRoutes(noSubFirstTenantId, matchInfo))
.thenReturn(Optional.of(CompletableFuture.completedFuture(localRoutes)))
.thenReturn(Optional.empty());
when(localTopicRouter.getTopicRoutes(noReceiverFirstTenantId, matchInfo))
.thenReturn(Optional.empty())
.thenReturn(Optional.of(CompletableFuture.completedFuture(localRoutes)));

DeliveryReply reply = localDistService.dist(request).join();

DeliveryResults noSubFirstResults = reply.getResultMap().get(noSubFirstTenantId);
assertEquals(noSubFirstResults.getResultCount(), 1);
assertEquals(noSubFirstResults.getResult(0).getCode(), DeliveryResult.Code.NO_RECEIVER);
DeliveryResults noReceiverFirstResults = reply.getResultMap().get(noReceiverFirstTenantId);
assertEquals(noReceiverFirstResults.getResultCount(), 1);
assertEquals(noReceiverFirstResults.getResult(0).getCode(), DeliveryResult.Code.NO_RECEIVER);
}

@Test
public void deliverToEmptyLocalRoutes() {
String tenantId = "tenant1";
Expand Down
Loading