Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gz: increase timeout for service request #24164

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −9
Open

gz: increase timeout for service request #24164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d9d18
gz: increase timeout for service request
dakejahl Jan 3, 2025
2467418
change error messages to warnings, specify retrying
dakejahl Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/modules/simulation/gz_bridge/GZBridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ int GZBridge::init()

// If Gazebo has not been called, wait 2 seconds and try again.
else {
PX4_WARN("Service call timed out as Gazebo has not been detected.");
PX4_WARN("Service call timed out as Gazebo has not been detected. Retrying...");
system_usleep(2000000);
}
}
Expand All @@ -159,7 +159,7 @@ int GZBridge::init()

while (scene_created == false) {
if (!callSceneInfoMsgService(scene_info_service)) {
PX4_WARN("Service call timed out as Gazebo has not been detected.");
PX4_WARN("Service call timed out as Gazebo has not been detected." Retrying...);
system_usleep(2000000);

} else {
Expand Down Expand Up @@ -919,7 +919,7 @@ bool GZBridge::callEntityFactoryService(const std::string &service, const gz::ms
}

} else {
PX4_ERR("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
PX4_WARN("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
return false;
}

Expand All @@ -932,7 +932,7 @@ bool GZBridge::callSceneInfoMsgService(const std::string &service)
gz::msgs::Empty req;
gz::msgs::Scene rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (_node.Request(service, req, 3000, rep, result)) {
if (!result) {
PX4_ERR("Scene Info service call failed.");
return false;
Expand All @@ -942,7 +942,7 @@ bool GZBridge::callSceneInfoMsgService(const std::string &service)
}

} else {
PX4_ERR("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
PX4_WARN("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
return false;
}

Expand All @@ -955,7 +955,7 @@ bool GZBridge::callStringMsgService(const std::string &service, const gz::msgs::

gz::msgs::Boolean rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (_node.Request(service, req, 3000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("String service call failed");
return false;
Expand All @@ -964,7 +964,7 @@ bool GZBridge::callStringMsgService(const std::string &service, const gz::msgs::
}

else {
PX4_ERR("Service call timed out: %s", service.c_str());
PX4_WARN("Service call timed out: %s", service.c_str());
return false;
}

Expand All @@ -977,7 +977,7 @@ bool GZBridge::callVector3dService(const std::string &service, const gz::msgs::V

gz::msgs::Boolean rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (_node.Request(service, req, 3000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("String service call failed");
return false;
Expand All @@ -986,7 +986,7 @@ bool GZBridge::callVector3dService(const std::string &service, const gz::msgs::V
}

else {
PX4_ERR("Service call timed out: %s", service.c_str());
PX4_WARN("Service call timed out: %s", service.c_str());
return false;
}

Expand Down
Loading