Refs #19576: Fix linux ci

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
eProsima · Sep 28, 2023 · 970ee23 · 970ee23
1 parent 6ef004e
commit 970ee23
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 242 deletions.
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -1144,12 +1144,15 @@ ReturnCode_t DataWriterImpl::set_qos(
         return ReturnCode_t::RETCODE_IMMUTABLE_POLICY;
     }
     set_qos(qos_, qos_to_set, enabled);
-    // Update times and positive_acks attributes
-    WriterAttributes w_att;
-    w_att.times = qos_.reliable_writer_qos().times;
-    w_att.disable_positive_acks = qos_.reliable_writer_qos().disable_positive_acks.enabled;
-    w_att.keep_duration = qos_.reliable_writer_qos().disable_positive_acks.duration;
-    writer_->updateAttributes(w_att);
+    if (enabled && qos_.reliability().kind == eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
+    {
+        // Update times and positive_acks attributes on RTPS Layer
+        WriterAttributes w_att;
+        w_att.times = qos_.reliable_writer_qos().times;
+        w_att.disable_positive_acks = qos_.reliable_writer_qos().disable_positive_acks.enabled;
+        w_att.keep_duration = qos_.reliable_writer_qos().disable_positive_acks.duration;
+        writer_->updateAttributes(w_att);
+    }
 
     if (enabled)
     {

diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -1623,7 +1623,10 @@ void StatefulWriter::updateAttributes(
         const WriterAttributes& att)
 {
     this->updateTimes(att.times);
-    this->updatePositiveAcks(att);
+    if (this->get_disable_positive_acks())
+    {
+        this->updatePositiveAcks(att);
+    }
 }
 
 void StatefulWriter::updatePositiveAcks(
@@ -1632,6 +1635,7 @@ void StatefulWriter::updatePositiveAcks(
     std::lock_guard<RecursiveTimedMutex> guard(mp_mutex);
     if (keep_duration_us_.count() != (att.keep_duration.to_ns() * 1e-3))
     {
+        // Implicit conversion to microseconds
         keep_duration_us_ = std::chrono::nanoseconds {att.keep_duration.to_ns()};
     }
     // Restart ack timer with new duration
@@ -2074,6 +2078,7 @@ bool StatefulWriter::ack_timer_expired()
 
         CacheChange_t* change;
 
+        // Skip removed changes until reaching the last change
         do
         {
             last_sequence_number_++;

diff --git a/test/blackbox/common/BlackboxTestsAcknackQos.cpp b/test/blackbox/common/BlackboxTestsAcknackQos.cpp