Adding in topic name to logging on IPC issues (#2706) (#2709)

* Adding in topic name to logging on IPC issues Signed-off-by: Steve Macenski <[email protected]> * Update test matching output logging Signed-off-by: Steve Macenski <[email protected]> * adding in single quotes Signed-off-by: Steve Macenski <[email protected]> --------- Signed-off-by: Steve Macenski <[email protected]> (cherry picked from commit a13e16e) Co-authored-by: Steve Macenski <[email protected]>
ros2 · Dec 14, 2024 · 1a353f0 · 1a353f0
1 parent e9edc3f
commit 1a353f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/rclcpp/include/rclcpp/publisher.hpp b/rclcpp/include/rclcpp/publisher.hpp
@@ -178,7 +178,6 @@ class Publisher : public PublisherBase
     const rclcpp::PublisherOptionsWithAllocator<AllocatorT> & options)
   {
     // Topic is unused for now.
-    (void)topic;
     (void)options;
 
     // If needed, setup intra process communication.
@@ -189,11 +188,13 @@ class Publisher : public PublisherBase
       // Register the publisher with the intra process manager.
       if (qos.history() != rclcpp::HistoryPolicy::KeepLast) {
         throw std::invalid_argument(
-                "intraprocess communication allowed only with keep last history qos policy");
+                "intraprocess communication on topic '" + topic +
+                "' allowed only with keep last history qos policy");
       }
       if (qos.depth() == 0) {
         throw std::invalid_argument(
-                "intraprocess communication is not allowed with a zero qos history depth value");
+                "intraprocess communication on topic '" + topic +
+                "' is not allowed with a zero qos history depth value");
       }
       if (qos.durability() != rclcpp::DurabilityPolicy::Volatile) {
         throw std::invalid_argument(

diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
@@ -186,11 +186,13 @@ class Subscription : public SubscriptionBase
       auto qos_profile = get_actual_qos();
       if (qos_profile.history() != rclcpp::HistoryPolicy::KeepLast) {
         throw std::invalid_argument(
-                "intraprocess communication allowed only with keep last history qos policy");
+                "intraprocess communication on topic '" + topic_name +
+                "' allowed only with keep last history qos policy");
       }
       if (qos_profile.depth() == 0) {
         throw std::invalid_argument(
-                "intraprocess communication is not allowed with 0 depth qos policy");
+                "intraprocess communication on topic '" + topic_name +
+                "' is not allowed with 0 depth qos policy");
       }
       if (qos_profile.durability() != rclcpp::DurabilityPolicy::Volatile) {
         throw std::invalid_argument(

diff --git a/rclcpp/test/rclcpp/test_publisher.cpp b/rclcpp/test/rclcpp/test_publisher.cpp
@@ -422,7 +422,8 @@ TEST_F(TestPublisher, intra_process_publish_failures) {
     node->create_publisher<test_msgs::msg::Empty>(
       "topic", rclcpp::QoS(0), options),
     std::invalid_argument(
-      "intraprocess communication is not allowed with a zero qos history depth value"));
+      "intraprocess communication on topic 'topic' "
+      "is not allowed with a zero qos history depth value"));
 }
 
 TEST_F(TestPublisher, inter_process_publish_failures) {