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

[19576] Updatable disable_positive_acks period (backport #3879) #3897

Merged
merged 6 commits into from
Oct 30, 2023
Merged

[19576] Updatable disable_positive_acks period (backport #3879) #3897

merged 6 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2023

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

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

You are currently cherry-picking commit b84825a5b.
  (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/dds/core/policy/QosPolicies.hpp
	modified:   include/fastdds/dds/publisher/qos/DataWriterQos.hpp
	modified:   include/fastdds/rtps/writer/StatefulWriter.h
	modified:   src/cpp/fastdds/publisher/DataWriterImpl.cpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp
	modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	renamed:    test/blackbox/common/BlackboxTestsAcknackQos.cpp -> test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
	modified:   test/blackbox/common/RTPSAsSocketReader.hpp
	modified:   test/blackbox/common/RTPSAsSocketWriter.hpp
	new file:   test/blackbox/common/RTPSBlackboxTestsPositiveAck.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp

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

@cferreiragonz @mergify
Updatable disable_positive_acks period (#3879)
edb12f3 
* Refs #19576: Test Update positive_acks period on RTPS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19567: Fix Update positive_acks period on RTPS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Test Update positive_acks period on DDS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix ack_timer and Updatability of positive_acks on DDS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Uncrustify fix

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix linux ci

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Ref #19576: DataReaderImpl update and updateAttributes call

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix mac-ci

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: move if clause

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit b84825a)

# Conflicts:
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 2, 2023
@mergify mergify bot mentioned this pull request Oct 2, 2023
Merged
12 tasks
@JLBuenoLopez JLBuenoLopez added this to the v2.6.7 milestone Oct 3, 2023
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Oct 3, 2023
cferreiragonz
cferreiragonz previously approved these changes Oct 3, 2023
View reviewed changes
@Mario-DL
Copy link
Member

Mario-DL commented Oct 9, 2023

Cherry picking the merge commit of #3915 needed

@MiguelCompany
Fix updatability of immutable DataWriterQos (#3915)
5d2ff42 
* Refs #19687. Add regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19687. Rename argument.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19687. Refactor on DataWriterImpl::set_qos.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Fixed log macro.
db7e264 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-3879 branch from fb862df to db7e264 Compare October 10, 2023 12:00
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

@MiguelCompany it seems that CI has build issues

@MiguelCompany
Copy link
Member

@richiprosima please test this

@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-3879 branch 2 times, most recently from 5ab9af9 to b592b9c Compare October 26, 2023 18:15
@MiguelCompany
Copy link
Member

@richiprosima please test this

MiguelCompany
MiguelCompany previously approved these changes Oct 26, 2023
View reviewed changes
@MiguelCompany
Fix build error.
02de9a7 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-3879 branch from b592b9c to 02de9a7 Compare October 27, 2023 05:37
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Remove unused header
bab70ea 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 1369e67 into 2.6.x Oct 30, 2023
1 of 2 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3879 branch October 30, 2023 10:49
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

@cferreiragonz cferreiragonz cferreiragonz left review comments

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.6.7
Development

Successfully merging this pull request may close these issues.
5 participants
@Mario-DL @MiguelCompany @JesusPoderoso @cferreiragonz @JLBuenoLopez