Discovery Server fix reconnection [12522] #2246

jparisu · 2021-10-04T12:25:31Z

Merge after #2244

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

MiguelCompany

Just a small nit.

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

MiguelCompany · 2021-10-28T08:32:53Z

@jparisu Also please fix linters

jparisu · 2021-11-02T11:41:43Z

Test with discovery server PR eProsima/Discovery-Server#45

Signed-off-by: jparisu <javierparis@eprosima.com>

MiguelCompany

Code looks good to me, but I still have to verify with the new tests.

MiguelCompany · 2021-11-03T06:46:36Z

Discovery Server CI with new timeouts:

jparisu · 2021-11-03T07:16:56Z

It seems like some tests are failing due to time limits, because executing (with SHM and without SHM) one of them fails and the other don't.
Let me check in my local and change the times for a wider timeout.

jparisu · 2021-11-03T09:03:51Z

The time has been slightly increased, it should be enough.
Please @MiguelCompany could you launch the tests again?

MiguelCompany · 2021-11-03T11:00:20Z

Discovery Server CI with new timeouts:

MiguelCompany · 2021-11-03T13:12:38Z

Discovery Server CI with new timeouts:

This is just failing setting a PR status, as it was not launched from a PR.

EduPonz · 2021-11-11T09:27:36Z

@richiprosima please test this

EduPonz · 2021-11-11T09:34:57Z

CI with corresponding Discovery Server tests:

EduPonz · 2021-11-11T14:47:05Z

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

@@ -1755,25 +1755,20 @@ void DiscoveryDataBase::unmatch_participant_(
                "Attempting to unmatch an unexisting participant: " << guid_prefix);
    }


I think this find is not necessary

Signed-off-by: jparisu <javierparis@eprosima.com>

EduPonz

LGTM, I'll run a CI just in case

EduPonz · 2021-11-15T08:16:47Z

Discovery Server tests with eProsima/Discovery-Server#45:

EduPonz · 2021-11-16T06:09:28Z

I'm concerned about the test_39_trivial_reconnect.SHM_ON failure. What do you think @jparisu?

jparisu · 2021-11-16T08:39:31Z

I'm concerned about the test_39_trivial_reconnect.SHM_ON failure. What do you think @jparisu?

I could replicate the error in local, and it is due to time limit inside the test. Server B dies before Server A Data(Up) could arrive (this could happen because they are different processes and the time could not fit correctly).
Commit eProsima/Discovery-Server@d72162f in tests extends the time of the test. This should not fail again.

EduPonz · 2021-11-16T09:12:33Z

Nice! One more CI run then with eProsima/Discovery-Server#45:

EduPonz · 2021-11-22T08:44:04Z

CI run with updated eProsima/Discovery-Server#45:

EduPonz · 2022-03-22T13:51:45Z

@Mergifyio backport 2.1.x

* Refs #12522: Fix minor ds errors Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: fix typo Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Client reconnection fix Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions to fix comment Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: uncrustify Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Apply new fix Signed-off-by: jparisu <javierparis@eprosima.com> (cherry picked from commit 4368260) # Conflicts: # src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp # src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp

mergify · 2022-03-22T13:52:29Z

backport 2.1.x

✅ Backports have been created

#2592 Discovery Server fix reconnection [12522] (backport #2246) has been created for branch 2.1.x

rsanchez15 · 2022-03-22T14:05:46Z

@Mergifyio backport 2.3.x

* Refs #12522: Fix minor ds errors Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: fix typo Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Client reconnection fix Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions to fix comment Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: uncrustify Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Apply new fix Signed-off-by: jparisu <javierparis@eprosima.com> (cherry picked from commit 4368260)

mergify · 2022-03-22T14:06:28Z

backport 2.3.x

✅ Backports have been created

#2594 Discovery Server fix reconnection [12522] (backport #2246) has been created for branch 2.3.x

Signed-off-by: RaulSanchez <raul@eprosima.com>

* Discovery Server fix reconnection (#2246) * Refs #12522: Fix minor ds errors Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: fix typo Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Client reconnection fix Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions to fix comment Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: uncrustify Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Apply new fix Signed-off-by: jparisu <javierparis@eprosima.com> (cherry picked from commit 4368260) # Conflicts: # src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp # src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp * Refs #14221: Fix conficts backport #2246 to 2.1.x Signed-off-by: RaulSanchez <raul@eprosima.com> Co-authored-by: jparisu <69341543+jparisu@users.noreply.github.com> Co-authored-by: RaulSanchez <raul@eprosima.com>

* Discovery Server fix reconnection (#2246) * Refs #12522: Fix minor ds errors Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: fix typo Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Client reconnection fix Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: apply suggestions to fix comment Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: uncrustify Signed-off-by: jparisu <javierparis@eprosima.com> * Refs #12522: Apply new fix Signed-off-by: jparisu <javierparis@eprosima.com> (cherry picked from commit 4368260) * Fix build error Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: jparisu <69341543+jparisu@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

jparisu mentioned this pull request Oct 4, 2021

Allow Discovery Server without Custom Listening Address [12570] #2247

Closed

jparisu marked this pull request as ready for review October 5, 2021 09:02

jparisu force-pushed the bugfix/ds-reconnection branch 2 times, most recently from 9879c57 to a035052 Compare October 6, 2021 09:16

jparisu changed the title ~~Discovery Server fix reconnection~~ Discovery Server fix reconnection [12522] Oct 7, 2021

MiguelCompany requested changes Oct 14, 2021

View reviewed changes

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp Outdated Show resolved Hide resolved

JLBuenoLopez mentioned this pull request Oct 25, 2021

Nodes don't reconnect to discovery server after restart [12742] #2290

Closed

JLBuenoLopez linked an issue Oct 25, 2021 that may be closed by this pull request

Nodes don't reconnect to discovery server after restart [12742] #2290

Closed

jparisu force-pushed the bugfix/ds-reconnection branch from a035052 to 1b1f1c9 Compare October 26, 2021 14:08

MiguelCompany requested changes Oct 28, 2021

View reviewed changes

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp Outdated Show resolved Hide resolved

MiguelCompany added this to the v2.4.1 milestone Nov 2, 2021

jparisu added 4 commits November 2, 2021 12:43

Refs #12522: Fix minor ds errors

c97f02d

Signed-off-by: jparisu <javierparis@eprosima.com>

Refs #12522: fix typo

038bd7f

Signed-off-by: jparisu <javierparis@eprosima.com>

Refs #12522: apply suggestions

5ecc804

Signed-off-by: jparisu <javierparis@eprosima.com>

Refs #12522: Client reconnection fix

33a309e

Signed-off-by: jparisu <javierparis@eprosima.com>

jparisu force-pushed the bugfix/ds-reconnection branch from c779aee to 33a309e Compare November 2, 2021 11:43

jparisu added 2 commits November 2, 2021 12:45

Refs #12522: apply suggestions to fix comment

3b1d6f5

Signed-off-by: jparisu <javierparis@eprosima.com>

Refs #12522: uncrustify

7f6c0d8

Signed-off-by: jparisu <javierparis@eprosima.com>

MiguelCompany previously approved these changes Nov 2, 2021

View reviewed changes

MiguelCompany added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Nov 3, 2021

EduPonz suggested changes Nov 11, 2021

View reviewed changes

Refs #12522: Apply new fix

9f68981

Signed-off-by: jparisu <javierparis@eprosima.com>

jparisu dismissed MiguelCompany’s stale review via 9f68981 November 12, 2021 10:03

EduPonz approved these changes Nov 15, 2021

View reviewed changes

EduPonz merged commit 4368260 into master Nov 22, 2021

EduPonz deleted the bugfix/ds-reconnection branch November 22, 2021 11:34

This was referenced Feb 1, 2022

Nodes hang after discovery server restart [13704] #2289

Closed

Nodes don't reconnect to TCP discovery server [13706] #2299

Closed

mergify bot mentioned this pull request Mar 22, 2022

Discovery Server fix reconnection [12522] [14221] (backport #2246) #2592

Merged

mergify bot mentioned this pull request Mar 22, 2022

Discovery Server fix reconnection [12522] (backport #2246) #2594

Merged

rsanchez15 added a commit that referenced this pull request Mar 23, 2022

Refs #14221: Fix conficts backport #2246 to 2.1.x

7e30298

Signed-off-by: RaulSanchez <raul@eprosima.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Discovery Server fix reconnection [12522] #2246

Discovery Server fix reconnection [12522] #2246

jparisu commented Oct 4, 2021

MiguelCompany left a comment

MiguelCompany commented Oct 28, 2021

jparisu commented Nov 2, 2021

MiguelCompany left a comment •

edited

Loading

MiguelCompany commented Nov 3, 2021 •

edited

Loading

jparisu commented Nov 3, 2021

jparisu commented Nov 3, 2021

MiguelCompany commented Nov 3, 2021

MiguelCompany commented Nov 3, 2021

EduPonz commented Nov 11, 2021

EduPonz commented Nov 11, 2021 •

edited

Loading

EduPonz Nov 11, 2021

EduPonz left a comment

EduPonz commented Nov 15, 2021

EduPonz commented Nov 16, 2021 •

edited

Loading

jparisu commented Nov 16, 2021

EduPonz commented Nov 16, 2021

EduPonz commented Nov 22, 2021

EduPonz commented Mar 22, 2022

mergify bot commented Mar 22, 2022

rsanchez15 commented Mar 22, 2022

mergify bot commented Mar 22, 2022

		@@ -1755,25 +1755,20 @@ void DiscoveryDataBase::unmatch_participant_(
		"Attempting to unmatch an unexisting participant: " << guid_prefix);
		}

Discovery Server fix reconnection [12522] #2246

Discovery Server fix reconnection [12522] #2246

Conversation

jparisu commented Oct 4, 2021

MiguelCompany left a comment

Choose a reason for hiding this comment

MiguelCompany commented Oct 28, 2021

jparisu commented Nov 2, 2021

MiguelCompany left a comment • edited Loading

Choose a reason for hiding this comment

MiguelCompany commented Nov 3, 2021 • edited Loading

jparisu commented Nov 3, 2021

jparisu commented Nov 3, 2021

MiguelCompany commented Nov 3, 2021

MiguelCompany commented Nov 3, 2021

EduPonz commented Nov 11, 2021

EduPonz commented Nov 11, 2021 • edited Loading

EduPonz Nov 11, 2021

Choose a reason for hiding this comment

EduPonz left a comment

Choose a reason for hiding this comment

EduPonz commented Nov 15, 2021

EduPonz commented Nov 16, 2021 • edited Loading

jparisu commented Nov 16, 2021

EduPonz commented Nov 16, 2021

EduPonz commented Nov 22, 2021

EduPonz commented Mar 22, 2022

mergify bot commented Mar 22, 2022

✅ Backports have been created

rsanchez15 commented Mar 22, 2022

mergify bot commented Mar 22, 2022

✅ Backports have been created

MiguelCompany left a comment •

edited

Loading

MiguelCompany commented Nov 3, 2021 •

edited

Loading

EduPonz commented Nov 11, 2021 •

edited

Loading

EduPonz commented Nov 16, 2021 •

edited

Loading