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

Support for partitions on DataWriterQoS and DataReaderQoS [12709] (backport #2274) #2294

Merged
merged 2 commits into from
Oct 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2021

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

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

You are currently cherry-picking commit c145a6f5a.
  (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:   src/cpp/fastdds/publisher/DataWriterImpl.cpp
	modified:   src/cpp/fastdds/publisher/PublisherImpl.cpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp
	modified:   src/cpp/fastdds/subscriber/SubscriberImpl.cpp
	new file:   test/blackbox/common/DDSBlackboxTestsEndpointPartitioning.cpp
	new file:   test/blackbox/partitions.xml
	modified:   test/unittest/dds/publisher/PublisherTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/CMakeLists.txt
	both modified:   test/unittest/dds/subscriber/SubscriberTests.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.io/

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 26, 2021
@JLBuenoLopez JLBuenoLopez added this to the v2.3.5 milestone Oct 27, 2021
jsan-rt and others added 2 commits October 27, 2021 12:07
* Refs #11849: Added support for partitions on DataWriters/DataReaders when using profiles

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #11849: Added Blackbox test and associated XML profiles

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #11849: Cleaned up Blackbox test includes

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #11849: Cleaned up partition string tokenizing

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #11849: Added test to check that partitions can be set via PropertyPolicyQos

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit c145a6f)
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

# Conflicts:
#	test/blackbox/CMakeLists.txt
#	test/unittest/dds/subscriber/SubscriberTests.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test windows

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature request] Support for partitions on DataWriterQoS and DataReaderQoS [11849]
3 participants