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

Add message lost event #232

Merged
merged 2 commits into from
Jun 17, 2020
Merged

Add message lost event #232

merged 2 commits into from
Jun 17, 2020

Conversation

ivanpauno
Copy link
Member

See #226.

First commit reorganizes event statuses headers in a subfolder, so we stop populating the old big rmw/types.h (the old headers are still including the new ones, to avoid creating a bunch of PRs together with this one).

The second commit actually implements what the title says.

@jacobperron
Copy link
Member

I'm happy if we distribute the event status definitions into their own header files, but I think it would be best done in it's own PR as it seems completely orthogonal to adding a new event type. At the very least, we should update this PR title to reflect that change and avoid squashing the two changes if we keep them in the same PR.

@ivanpauno
Copy link
Member Author

I'm happy if we distribute the event status definitions into their own header files, but I think it would be best done in it's own PR as it seems completely orthogonal to adding a new event type. At the very least, we should update this PR title to reflect that change and avoid squashing the two changes if we keep them in the same PR.

Yes, I'm not planning to squash both commits.
The header redistribution was to avoid increasing the size of (the already big) types.h.
I then added the extra events_statuses folder, to avoid having a lots of headers in a flat layout.

@ivanpauno ivanpauno marked this pull request as ready for review June 10, 2020 19:56
Copy link
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

LGTM, but I'd like to have at least a second reviewer for changes in rmw (@ros2/team)

@wjwwood
Copy link
Member

wjwwood commented Jun 10, 2020

Yes, I'm not planning to squash both commits.

I'd much prefer you did and have two separate pr's. It makes changelogs and cherry-picking much easier... But that's fine this time.

@ivanpauno
Copy link
Member Author

I'd much prefer you did and have two separate pr's. It makes changelogs and cherry-picking much easier... But that's fine this time.

If I rebase merge, the changelog generation and cherry-picking process will be exactly the same than if I open 2 PRs.
I also do the extra step of editing commit messages and adding a reference to the PR (like is automatically done when squash-merging) when rebase merging. So, it's easy to find the original PR from the commit.

I preferred in this case not splitting the PR, as this feature is already composed by 6 PRs.
I can split it if there's a strong preference for that workflow.

@wjwwood
Copy link
Member

wjwwood commented Jun 10, 2020

If I rebase merge, the changelog generation and cherry-picking process will be exactly the same than if I open 2 PRs. I also do the extra step of editing commit messages and adding a reference to the PR (like is automatically done when squash-merging) when rebase merging. So, it's easy to find the original PR from the commit.

If you're adding the back reference in the commit message then that's ok, that's the main thing that's nice to have in the changelog.

@wjwwood
Copy link
Member

wjwwood commented Jun 10, 2020

I preferred in this case not splitting the PR, as this feature is already composed by 6 PRs.

Yeah, but the file reorganization could have been merged directly I think. This pr could have been based on it, and re-targeted after it was merged. Just say, I'd prefer not to couple things into pull requests in those cases.

@wjwwood
Copy link
Member

wjwwood commented Jun 10, 2020

Again, this is all just for future reference. I think think this pr doesn't need to change.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno ivanpauno force-pushed the ivanpauno/add-message-lost-event branch from 8287105 to c8d3e67 Compare June 11, 2020 16:31
@ivanpauno
Copy link
Member Author

Last force push edited commit messages without introducing code changes.

@ivanpauno
Copy link
Member Author

ivanpauno commented Jun 11, 2020

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status (unrelated failures)
  • Windows Build Status

@ivanpauno ivanpauno merged commit 343de2a into master Jun 17, 2020
ivanpauno added a commit that referenced this pull request Jun 17, 2020
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@delete-merged-branch delete-merged-branch bot deleted the ivanpauno/add-message-lost-event branch June 17, 2020 21:57
ahcorde pushed a commit that referenced this pull request Oct 28, 2020
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
ahcorde pushed a commit that referenced this pull request Oct 28, 2020
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants