From 56c21f36c3847910a6b0a0a3e67d10058a344a96 Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Thu, 9 Jan 2025 07:14:43 -0800 Subject: [PATCH] Fix EDP reliability timings (#5540) * EDP default configuration should be in milliseconds, not microseconds. Signed-off-by: Tomoya Fujita * add the timeout for writer->wait_discovery(). Signed-off-by: Tomoya Fujita * Refs #22537: test fix Signed-off-by: Mario Dominguez --------- Signed-off-by: Tomoya Fujita Signed-off-by: Mario Dominguez Co-authored-by: Mario Dominguez (cherry picked from commit b53a3899e035dcb3bc8c39d392a66a3a236bc4bb) --- src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp | 6 +++--- test/blackbox/common/DDSBlackboxTestsStatistics.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 861b47a0d76..963bbce86df 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -56,9 +56,9 @@ namespace rtps { // Default configuration values for EDP entities. static const dds::Duration_t edp_heartbeat_period{1, 0}; // 1 second -static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 }; // 100 milliseconds -static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000}; // 10 milliseconds -static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000}; // 10 milliseconds +static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 * 1000 }; // 100 milliseconds +static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000 * 1000}; // 10 milliseconds +static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000 * 1000}; // 10 milliseconds static const int32_t edp_reader_initial_reserved_caches = 1; static const int32_t edp_writer_initial_reserved_caches = 20; diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp index 958e038c86c..4bf531ca9e7 100644 --- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp +++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp @@ -763,7 +763,7 @@ TEST(DDSStatistics, correct_deletion_upon_delete_contained_entities) writer->init(); ASSERT_TRUE(writer->isInitialized()); writer->wait_discovery(); - writer->send(*data, 10); + writer->send(*data, 200); writer->destroy(); }));