From d6fc34125fb8542024f34a5e4fd2e0cd94d4a530 Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Mon, 6 Jan 2025 19:44:55 -0800 Subject: [PATCH 1/3] EDP default configuration should be in milliseconds, not microseconds. Signed-off-by: Tomoya Fujita --- src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 3cd6fff53e3..2aaf642c479 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; From 50762e85c69f3c4a978b380a1a32d82767f5c412 Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Wed, 8 Jan 2025 13:38:17 -0800 Subject: [PATCH 2/3] add the timeout for writer->wait_discovery(). Signed-off-by: Tomoya Fujita --- test/blackbox/common/DDSBlackboxTestsStatistics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp index 958e038c86c..f6023945565 100644 --- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp +++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp @@ -762,7 +762,7 @@ TEST(DDSStatistics, correct_deletion_upon_delete_contained_entities) { writer->init(); ASSERT_TRUE(writer->isInitialized()); - writer->wait_discovery(); + writer->wait_discovery(std::chrono::seconds(3)); writer->send(*data, 10); writer->destroy(); })); From cf4d45b7a35feb6d45237b0eb3d06d3b451842c1 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Thu, 9 Jan 2025 09:39:44 +0100 Subject: [PATCH 3/3] Refs #22537: test fix Signed-off-by: Mario Dominguez --- test/blackbox/common/DDSBlackboxTestsStatistics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp index f6023945565..4bf531ca9e7 100644 --- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp +++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp @@ -762,8 +762,8 @@ TEST(DDSStatistics, correct_deletion_upon_delete_contained_entities) { writer->init(); ASSERT_TRUE(writer->isInitialized()); - writer->wait_discovery(std::chrono::seconds(3)); - writer->send(*data, 10); + writer->wait_discovery(); + writer->send(*data, 200); writer->destroy(); }));