Skip to content

Enabling soft realtime prioritization to the Controller Server (backport #3914)#3976

Closed
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-3914
Closed

Enabling soft realtime prioritization to the Controller Server (backport #3914)#3976
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-3914

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2023

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

On branch mergify/bp/humble/pr-3914
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit fbe8f560.
  (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:   nav2_bringup/params/nav2_params.yaml
	modified:   nav2_controller/include/nav2_controller/controller_server.hpp
	modified:   nav2_util/include/nav2_util/node_thread.hpp
	modified:   nav2_util/include/nav2_util/simple_action_server.hpp
	modified:   nav2_util/src/node_thread.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_controller/src/controller_server.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.com

* Enabling soft realtime prioritization to the controller server

* abstracting to another function

* changing default priorities

* linting

(cherry picked from commit fbe8f56)

# Conflicts:
#	nav2_controller/src/controller_server.cpp
@mergify mergify bot added the conflicts label Nov 20, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Nov 20, 2023

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @humble, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski SteveMacenski deleted the mergify/bp/humble/pr-3914 branch November 20, 2023 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant