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

iox-#615 unblock RouDi shutdown with blocked publisher #681

Conversation

elBoberido
Copy link
Member

@elBoberido elBoberido commented Apr 6, 2021

Pre-Review Checklist for the PR Author

  1. Code follows the coding style of CONTRIBUTING.md
  2. Tests follow the best practice for testing
  3. Branch follows the naming format (iox-#123-this-is-a-branch)
  4. Commits messages are according to this guideline
    • Commit messages have the issue ID (iox-#123 commit text)
    • Commit messages are signed (git commit -s)
    • Commit author matches Eclipse Contributor Agreement (and ECA is signed)
  5. Update the PR title
    • Follow the same conventions as for commit messages
    • Link to the relevant issue
  6. Relevant issues are linked
  7. Add sensible notes for the reviewer
  8. All required checks have passed (except task-list-completed)
  9. Assign PR to reviewer

Notes for Reviewer

This fixes the issue that a blocked publisher blocks the RouDi shutdown. It's manually tested and a automated test will follow. I created the PR to get the fix into the next RC.

Checklist for the PR Reviewer

  • Commits are properly organized and messages are according to the guideline
  • Code according to our coding style and naming conventions
  • Unit tests have been written for new behavior
  • Public API changes are documented via doxygen
  • Copyright owner are updated in the changed files
  • PR title describes the changes

Post-review Checklist for the PR Author

  1. All open points are addressed and tracked via issues

References

… by full subscriber queue

Signed-off-by: Mathias Kraus <mathias.kraus@apex.ai>
@elBoberido elBoberido changed the base branch from master to release_1.0 April 6, 2021 16:43
@codecov
Copy link

codecov bot commented Apr 6, 2021

Codecov Report

Merging #681 (8f66334) into release_1.0 (e6a3293) will decrease coverage by 0.08%.
The diff coverage is 23.07%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release_1.0     #681      +/-   ##
===============================================
- Coverage        74.54%   74.46%   -0.09%     
===============================================
  Files              317      317              
  Lines            11217    11224       +7     
  Branches          1969     1970       +1     
===============================================
- Hits              8362     8358       -4     
- Misses            2078     2087       +9     
- Partials           777      779       +2     
Flag Coverage Δ
unittests 74.42% <23.07%> (-0.09%) ⬇️
unittests_timing 31.35% <23.07%> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...clude/iceoryx_posh/internal/roudi/port_manager.hpp 100.00% <ø> (ø)
iceoryx_posh/source/roudi/port_manager.cpp 74.83% <0.00%> (-1.76%) ⬇️
iceoryx_posh/source/roudi/process_manager.cpp 64.13% <0.00%> (-0.20%) ⬇️
iceoryx_posh/source/roudi/roudi.cpp 56.09% <60.00%> (-0.27%) ⬇️
iceoryx_utils/source/posix_wrapper/timer.cpp 59.64% <0.00%> (-1.76%) ⬇️
...ils/include/iceoryx_utils/internal/cxx/smart_c.inl 87.50% <0.00%> (-1.57%) ⬇️
...nternal/roudi/introspection/port_introspection.inl 72.62% <0.00%> (+0.72%) ⬆️

@mossmaurice mossmaurice added the bugfix Solves a bug label Apr 6, 2021
@@ -111,16 +120,10 @@ void RouDi::shutdown()
m_prcMgr->printWarningForRegisteredProcessesAndClearProcessList();
}
}

// Postpone the IpcChannelThread in order to receive TERMINATION
m_runIpcChannelThread = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be renamed:

Suggested change
m_runIpcChannelThread = false;
m_runRuntimeMessagesThread = false;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, will do it in the follow up

m_runDiscoveryThread = false;
if (m_processManagementThread.joinable())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we please rename this thread to something saner at some point? I just mixed up m_processMan.. and m_processRun.. :P

Maybe m_monitorAndDiscoveryThread and m_handleRuntimeMessageThread?

@elBoberido elBoberido merged commit 1d1ce70 into eclipse-iceoryx:release_1.0 Apr 6, 2021
@elBoberido elBoberido deleted the iox-#615-unblock-RouDi-shutdown-with-blocked-publisher branch April 6, 2021 17:20
marthtz pushed a commit to boschglobal/iceoryx that referenced this pull request May 12, 2021
…ouDi-shutdown-with-blocked-publisher

iox-eclipse-iceoryx#615 unblock RouDi shutdown with blocked publisher
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Solves a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Possibility to block the publisher when subscriber queue is full
3 participants