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

Fix the shared memory cleaning script. #4369

Merged
merged 1 commit into from
Feb 22, 2024

Conversation

shumov-ag
Copy link
Contributor

@shumov-ag shumov-ag commented Feb 9, 2024

Description

Fix the regular expression that leads to skipping the processing of shared lock files by fastdds shm clean command.

To reproduce the problem you can use next script:

Python 3.8.10 (default, Jun 22 2022, 20:18:18) 
[GCC 9.4.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import re
>>> port_lock_re = re.compile('^fastrtps_port\\d{,5}_el|_sl')
>>> bool(port_lock_re.match('fastrtps_port7777_el'))
True
>>> bool(port_lock_re.match('fastrtps_port7777_sl'))
False      <----------------------------------------------------- here is a problem
>>> 

After this fix, the behavior will be as follow:

Python 3.8.10 (default, Jun 22 2022, 20:18:18) 
[GCC 9.4.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import re
>>> port_lock_re = re.compile('^fastrtps_port\\d{,5}(_el|_sl)')
>>> bool(port_lock_re.match('fastrtps_port7777_el'))
True
>>> bool(port_lock_re.match('fastrtps_port7777_sl'))
True
>>> 

@Mergifyio backport 2.12.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A: Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A: New feature has been added to the versions.md file (if applicable).
  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
@Mario-DL Mario-DL added this to the v2.13.3 milestone Feb 14, 2024
@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Feb 21, 2024
@JesusPoderoso JesusPoderoso reopened this Feb 21, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Feb 21, 2024
@EduPonz
Copy link

EduPonz commented Feb 21, 2024

@Mergifyio backport 2.12.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Feb 21, 2024

backport 2.12.x 2.10.x 2.6.x

🟠 Waiting for conditions to match

  • merged [📌 backport requirement]

@JesusPoderoso
Copy link
Contributor

Thanks for your contribution @shumov-ag!
Going in.

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Feb 22, 2024
@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 2.12.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Feb 22, 2024

backport 2.12.x 2.10.x 2.6.x

✅ Backports have been created

@EduPonz EduPonz merged commit 8c3e3b3 into eProsima:master Feb 22, 2024
15 of 24 checks passed
mergify bot pushed a commit that referenced this pull request Feb 22, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)
mergify bot pushed a commit that referenced this pull request Feb 22, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)
elianalf pushed a commit that referenced this pull request Feb 23, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)
EduPonz pushed a commit that referenced this pull request Feb 24, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)

Co-authored-by: Artem Shumov <agshumov@sberautotech.ru>
EduPonz pushed a commit that referenced this pull request Feb 24, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)

Co-authored-by: Artem Shumov <agshumov@sberautotech.ru>
EduPonz pushed a commit that referenced this pull request Feb 24, 2024
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
(cherry picked from commit 8c3e3b3)

Co-authored-by: Artem Shumov <agshumov@sberautotech.ru>
@shumov-ag shumov-ag deleted the fix-fastdds-shm-clean-script branch March 1, 2024 05:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants