Skip to content

[14091] Fix update remote server locators when enabling statistics #2601

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

Merged
MiguelCompany merged 2 commits into from
Apr 12, 2022
Merged

[14091] Fix update remote server locators when enabling statistics #2601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a799134
Refs #14091: fix update remote server locators when enabling statistics
JLBuenoLopez Mar 24, 2022
d1811ad
Refs #14091: call createSenderResources only if there are modified lo…
JLBuenoLopez Mar 24, 2022
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
6 changes: 6 additions & 0 deletions src/cpp/rtps/participant/RTPSParticipantImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@ void RTPSParticipantImpl::update_attributes(
{
update_pdp = true;
std::vector<GUID_t> modified_servers;
LocatorList_t modified_locators;
// Check that the remote servers list is consistent: all the already known remote servers must be included in
// the list and either new remote servers are added or remote server listening locator is modified.
for (auto existing_server : m_att.builtin.discovery_config.m_DiscoveryServers)
Expand All @@ -1237,6 +1238,7 @@ void RTPSParticipantImpl::update_attributes(
if (!locator_contained)
{
modified_servers.emplace_back(incoming_server.GetParticipant());
modified_locators.push_back(incoming_locator);
logInfo(RTPS_QOS_CHECK,
"DS Server: " << incoming_server.guidPrefix << " has modified its locators: "
<< incoming_locator << " being added")
Expand Down Expand Up @@ -1283,6 +1285,10 @@ void RTPSParticipantImpl::update_attributes(
createSenderResources(m_att.builtin.metatrafficMulticastLocatorList);
createSenderResources(m_att.builtin.metatrafficUnicastLocatorList);
createSenderResources(m_att.defaultUnicastLocatorList);
if (!modified_locators.empty())
{
createSenderResources(modified_locators);
}

// Update remote servers list
if (m_att.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::CLIENT ||
Expand Down