Skip to content

Fix the shared memory cleaning script.#4369

Merged
EduPonz merged 1 commit intoeProsima:masterfrom
shumov-ag:fix-fastdds-shm-clean-script
Feb 22, 2024
Merged

Fix the shared memory cleaning script.#4369
EduPonz merged 1 commit intoeProsima:masterfrom
shumov-ag:fix-fastdds-shm-clean-script

Conversation

@shumov-ag
Copy link
Copy Markdown
Contributor

@shumov-ag shumov-ag commented Feb 9, 2024 •
edited by EduPonz
Loading

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.

@shumov-ag
Fix the shared memory cleaning script.
12ee950 
Fix the invalid regular expression that leads to skipping the processing of shared lock files.

Signed-off-by: Artem Shumov <agshumov@sberautotech.ru>
@shumov-ag shumov-ag force-pushed the fix-fastdds-shm-clean-script branch from bd3dd8d to 12ee950 Compare February 9, 2024 11:08
@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
Copy Markdown
Contributor

JesusPoderoso commented Feb 21, 2024

@richiprosima please test this

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

EduPonz commented Feb 21, 2024

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 21, 2024

backport 2.12.x 2.10.x 2.6.x

🟠 Waiting for conditions to match

Details
  • merged [📌 backport requirement]

@JesusPoderoso
Copy link
Copy Markdown
Contributor

JesusPoderoso commented Feb 22, 2024

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
Copy Markdown
Contributor

JesusPoderoso commented Feb 22, 2024

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 22, 2024 •
edited
Loading

backport 2.12.x 2.10.x 2.6.x

✅ Backports have been created

Details

@EduPonz EduPonz merged commit 8c3e3b3 into eProsima:master Feb 22, 2024
mergify bot pushed a commit that referenced this pull request Feb 22, 2024
@shumov-ag @mergify
Fix the shared memory cleaning script (#4369)
5e9597e 
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
@shumov-ag @mergify
Fix the shared memory cleaning script (#4369)
c9d7adf 
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)
This was referenced Feb 22, 2024
Merged
Merged
Merged
elianalf pushed a commit that referenced this pull request Feb 23, 2024
@shumov-ag @elianalf
Fix the shared memory cleaning script (#4369)
e891d88 
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
@mergify @shumov-ag
Fix the shared memory cleaning script (#4369) (#4425)
ff3d96c 
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
@mergify @shumov-ag
Fix the shared memory cleaning script (#4369) (#4426)
47591e4 
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
@mergify @shumov-ag
Fix the shared memory cleaning script (#4369) (#4424)
061a68e 
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

Reviewers

No reviews

Assignees

No one assigned

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI

Projects

None yet

Milestone

v2.13.3

Development

Successfully merging this pull request may close these issues.

4 participants

@shumov-ag @JesusPoderoso @EduPonz @Mario-DL