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.

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

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

Merged
merged 2 commits into from
Mar 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2022

This is an automatic backport of pull request #2246 done by Mergify.
Cherry-pick of 4368260 has failed:

On branch mergify/bp/2.1.x/pr-2246
Your branch is up to date with 'origin/2.1.x'.

You are currently cherry-picking commit 436826000.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/fastdds/rtps/builtin/discovery/participant/PDPClient.h
	modified:   src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* 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 mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 22, 2022
@rsanchez15 rsanchez15 closed this Mar 22, 2022
@rsanchez15 rsanchez15 reopened this Mar 22, 2022
Signed-off-by: RaulSanchez <raul@eprosima.com>
@rsanchez15 rsanchez15 changed the title Discovery Server fix reconnection [12522] (backport #2246) Discovery Server fix reconnection [12522] [14221] (backport #2246) Mar 23, 2022
@richiprosima
Copy link
Contributor

Can't set status; build failed.

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 96995e9 into 2.1.x Mar 25, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2246 branch March 25, 2022 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants