-
Notifications
You must be signed in to change notification settings - Fork 791
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
Fix incosistences between Pub/Sub history and RTPS history [12620] #2239
Fix incosistences between Pub/Sub history and RTPS history [12620] #2239
Conversation
Signed-off-by: Ricardo González <ricardo@richiware.dev>
Signed-off-by: Ricardo González <ricardo@richiware.dev>
Signed-off-by: Ricardo González <ricardo@richiware.dev>
b6f7a48
to
a622869
Compare
Signed-off-by: Ricardo González <ricardo@richiware.dev>
909ad48
to
40f56a0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modifications seem OK, but there is a new warning on the MAC build:
SubscriberHistory.h:94 - 'completed_change' overrides a member function but is not marked 'override'
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@IkerLuengo I fixed this on e87d31a |
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@Mergifyio backport 2.3.x |
* Refs #12161. Add test large fragmented samples with key Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix deserializing not completed sample Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix inconsistence between histories Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix uncrustify Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs 12620. Added override on overriden method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Added new virtual method to ReaderHistory mock Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12620. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 6003592) # Conflicts: # test/blackbox/CMakeLists.txt # test/blackbox/common/BlackboxTestsPubSubFragments.cpp
✅ Backports have been created
|
👏🏾 Thanks @MiguelCompany |
* Fix incosistences between Pub/Sub history and RTPS history (#2239) * Refs #12161. Add test large fragmented samples with key Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix deserializing not completed sample Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix inconsistence between histories Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs #12161. Fix uncrustify Signed-off-by: Ricardo González <ricardo@richiware.dev> * Refs 12620. Added override on overriden method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Added new virtual method to ReaderHistory mock Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12620. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 6003592) # Conflicts: # test/blackbox/CMakeLists.txt # test/blackbox/common/BlackboxTestsPubSubFragments.cpp * Refs #12620. Fix conflict Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Co-authored-by: Ricardo González <ricardo@richiware.dev>
When it is received a HEARTBEAT, its firstSN is used to find fragmented samples not fully assembled yet and remove them. This functionality is done by
ReaderHistory::remove_fragmented_changes_until
. But this function only removes the changes from theReaderHistory
, but not fromSubscriberHistory
, provoking inconsistences in the instances' vector.