TestCI bugfix investigation

moquette-io · Dec 15, 2023 · cad20d4 · cad20d4
1 parent 06d6119
commit cad20d4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/.github/workflows/temp_maven_build_debug.yml b/.github/workflows/temp_maven_build_debug.yml
@@ -0,0 +1,26 @@
+# This workflow is copied from maven_build.yml and is temporarily used to throubleshoot failure that appears only in CI
+
+name: Java CI with Maven
+
+on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        name: Temp test of CI
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v2
+
+            - name: Set up JDK
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 17
+                  architecture: x64
+            - name: Test with Maven
+              run: ./mvnw -Dtest="SharedSubscriptionTest#givenSharedSubscriptionWithCertainQoSWhenSameClientWithSameShareSubscribeToSameTopicFilterThenQoSUpdates" test -pl broker --file pom.xml
+
diff --git a/broker/src/main/java/io/moquette/broker/MQTTConnection.java b/broker/src/main/java/io/moquette/broker/MQTTConnection.java
@@ -690,10 +690,10 @@ void sendPublish(MqttPublishMessage publishMsg) {
         final String topicName = publishMsg.variableHeader().topicName();
         MqttQoS qos = publishMsg.fixedHeader().qosLevel();
         if (LOG.isTraceEnabled()) {
-            LOG.trace("Sending PUBLISH({}) message. MessageId={}, topic={}, payload={}", qos, packetId, topicName,
-                DebugUtils.payload2Str(publishMsg.payload()));
+            LOG.trace("Sending PUBLISH({}) message. MessageId={}, topic={}, payload={} to {}", qos, packetId, topicName,
+                DebugUtils.payload2Str(publishMsg.payload()), getClientId());
         } else {
-            LOG.debug("Sending PUBLISH({}) message. MessageId={}, topic={}", qos, packetId, topicName);
+            LOG.debug("Sending PUBLISH({}) message. MessageId={}, topic={} to {}", qos, packetId, topicName, getClientId());
         }
         sendIfWritableElseDrop(publishMsg);
     }
@@ -703,7 +703,7 @@ void sendIfWritableElseDrop(MqttMessage msg) {
             LOG.debug("OUT {}", msg.fixedHeader().messageType());
         }
         if (channel.isWritable()) {
-
+            LOG.debug("Sending message {} on the wire", msg.fixedHeader().messageType());
             // Sending to external, retain a duplicate. Just retain is not
             // enough, since the receiver must have full control.
             Object retainedDup = msg;
@@ -718,6 +718,8 @@ void sendIfWritableElseDrop(MqttMessage msg) {
                 channelFuture = channel.write(retainedDup);
             }
             channelFuture.addListener(FIRE_EXCEPTION_ON_FAILURE);
+        } else {
+            LOG.debug("Dropping message {} on the wire, msg: {}", msg.fixedHeader().messageType(), msg);
         }
     }
 

diff --git a/broker/src/test/java/io/moquette/integration/mqtt5/SharedSubscriptionTest.java b/broker/src/test/java/io/moquette/integration/mqtt5/SharedSubscriptionTest.java
@@ -193,6 +193,7 @@ private static void verifyPubPayload(MqttMessage received, String expectedPayloa
         MqttPublishMessage pub = (MqttPublishMessage) received;
         String payload = pub.payload().asByteBuf().toString(StandardCharsets.UTF_8);
         assertEquals(expectedPayload, payload);
+        assertTrue(pub.release(), "received message must be deallocated");
     }
 
     @NotNull
@@ -279,6 +280,8 @@ public void givenSharedSubscriptionWithCertainQoSWhenSameClientWithSameShareSubs
         // because the PUB is at QoS1 and the subscription is at QoS0, the subscribed doesn't receive any message
         verifyNoPublish(subscriberClient,Duration.ofSeconds(1), "No message is expected at Qos0 subscription");
 
+        LOG.info("Before repeating with AT_LEAST_ONCE");
+
         // update QoS for shared subscription
         subscribe(subscriberClient, "$share/collectors/metric/temperature/living", MqttQos.AT_LEAST_ONCE);
 

diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties
@@ -1,7 +1,7 @@
 #log4j.rootLogger=ERROR, stdout, file
 log4j.rootLogger=ERROR, stdout
 
-log4j.logger.io.moquette=WARN
+log4j.logger.io.moquette=DEBUG
 #log4j.logger.io.moquette.broker=DEBUG
 #log4j.logger.io.moquette.broker.MQTTConnection=DEBUG
 #log4j.logger.io.moquette.broker.SessionRegistry=DEBUG