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

Jump to bottom

Persistence guid hotfixes [12680] #2244

Merged
merged 7 commits into from
Nov 2, 2021
Merged

Persistence guid hotfixes [12680] #2244

merged 7 commits into from
Nov 2, 2021

Conversation

jparisu
Copy link
Contributor

@jparisu jparisu commented Oct 4, 2021

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

@jparisu
Copy link
Contributor Author

jparisu commented Oct 4, 2021

@richiprosima please test this

@jparisu jparisu mentioned this pull request Oct 4, 2021
Merged
@jparisu jparisu marked this pull request as ready for review October 5, 2021 09:02
@MiguelCompany
Copy link
Member

@richiprosima Please test windows

MiguelCompany
MiguelCompany requested changes Oct 14, 2021
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor typos only

src/cpp/rtps/reader/StatefulReader.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/reader/StatefulReader.cpp Outdated Show resolved Hide resolved
@MiguelCompany MiguelCompany changed the title Persistence guid hotfixes [12522] Persistence guid hotfixes [12680] Oct 14, 2021
@MiguelCompany
Copy link
Member

@richiprosima Please test windows

jparisu added 7 commits October 26, 2021 16:06
Refs #12522: Set persistence guid correctly
fa8b9c2 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: Eliminate sporious records in RTPSReader
a4bb5a7 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: Avoid creating proxies from death participants
bf1aa23 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: fix in record update
00f85aa 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: uncrustify
1603382 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: Refix History State
e194052 
Signed-off-by: jparisu <javierparis@eprosima.com>
Refs #12522: fix typos in comment
fd3c980 
Signed-off-by: jparisu <javierparis@eprosima.com>
@jparisu jparisu force-pushed the hotfix/persistence_guid branch from bc8857b to fd3c980 Compare October 26, 2021 14:07
@MiguelCompany
Copy link
Member

@richiprosima Please test this

MiguelCompany
MiguelCompany approved these changes Oct 29, 2021
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but let's launch another CI run!

@MiguelCompany
Copy link
Member

@richiprosima Please test windows

@jparisu
Copy link
Contributor Author

jparisu commented Oct 29, 2021

I could not replicate the error of discovery_server_linux in my local

@jparisu
Copy link
Contributor Author

jparisu commented Oct 29, 2021

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test windows

@MiguelCompany MiguelCompany merged commit 7280e1d into master Nov 2, 2021
@MiguelCompany MiguelCompany deleted the hotfix/persistence_guid branch November 2, 2021 08:37
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.3.x

mergify bot pushed a commit that referenced this pull request Nov 2, 2021
@jparisu
Persistence guid hotfixes (#2244)
fbbfafd 
* Refs #12522: Set persistence guid correctly

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

* Refs #12522: Eliminate sporious records in RTPSReader

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

* Refs #12522: Avoid creating proxies from death participants

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

* Refs #12522: fix in record update

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

* Refs #12522: uncrustify

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

* Refs #12522: Refix History State

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

* Refs #12522: fix typos in comment

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 7280e1d)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h
@mergify mergify bot mentioned this pull request Nov 2, 2021
Merged
@mergify
Copy link
Contributor

mergify bot commented Nov 2, 2021

backport 2.3.x

✅ Backports have been created

MiguelCompany added a commit that referenced this pull request Nov 3, 2021
@mergify @jparisu @MiguelCompany
Persistence guid hotfixes (#2301)
ad09169 
* Persistence guid hotfixes (#2244)

* Refs #12522: Set persistence guid correctly

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

* Refs #12522: Eliminate sporious records in RTPSReader

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

* Refs #12522: Avoid creating proxies from death participants

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

* Refs #12522: fix in record update

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

* Refs #12522: uncrustify

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

* Refs #12522: Refix History State

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

* Refs #12522: fix typos in comment

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 7280e1d)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h

* Fixed backport conflicts

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>
@EduPonz
Copy link

EduPonz commented Mar 22, 2022

@Mergifyio backport 2.1.x

@mergify mergify bot mentioned this pull request Mar 22, 2022
Closed
mergify bot pushed a commit that referenced this pull request Mar 22, 2022
@jparisu
Persistence guid hotfixes (#2244)
17fea0d 
* Refs #12522: Set persistence guid correctly

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

* Refs #12522: Eliminate sporious records in RTPSReader

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

* Refs #12522: Avoid creating proxies from death participants

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

* Refs #12522: fix in record update

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

* Refs #12522: uncrustify

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

* Refs #12522: Refix History State

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

* Refs #12522: fix typos in comment

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 7280e1d)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h
@mergify
Copy link
Contributor

mergify bot commented Mar 22, 2022

backport 2.1.x

✅ Backports have been created

mergify bot added a commit that referenced this pull request Mar 22, 2022
@mergify
Persistence guid hotfixes (#2301)
ac7988a 
* Persistence guid hotfixes (#2244)

* Refs #12522: Set persistence guid correctly

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

* Refs #12522: Eliminate sporious records in RTPSReader

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

* Refs #12522: Avoid creating proxies from death participants

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

* Refs #12522: fix in record update

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

* Refs #12522: uncrustify

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

* Refs #12522: Refix History State

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

* Refs #12522: fix typos in comment

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 7280e1d)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h

* Fixed backport conflicts

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>
(cherry picked from commit ad09169)
MiguelCompany pushed a commit that referenced this pull request Mar 24, 2022
@mergify
Persistence guid hotfixes (#2593)
5b5110d 
* Persistence guid hotfixes (#2244)

* Refs #12522: Set persistence guid correctly

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

* Refs #12522: Eliminate sporious records in RTPSReader

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

* Refs #12522: Avoid creating proxies from death participants

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

* Refs #12522: fix in record update

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

* Refs #12522: uncrustify

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

* Refs #12522: Refix History State

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

* Refs #12522: fix typos in comment

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 7280e1d)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.h

* Fixed backport conflicts

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>
(cherry picked from commit ad09169)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jparisu @MiguelCompany @EduPonz