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

Update spawner to accept controllers list and start them in sequence (backport #1139) #1149

Merged
merged 7 commits into from
Nov 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2023

This is an automatic backport of pull request #1139 done by Mergify.
Cherry-pick of 4e78813 has failed:

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

You are currently cherry-picking commit 4e78813.
  (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:   controller_manager/test/test_spawner_unspawner.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/spawner.py
	both modified:   controller_manager/controller_manager/unspawner.py

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

…1139)

(cherry picked from commit 4e78813)

# Conflicts:
#	controller_manager/controller_manager/spawner.py
#	controller_manager/controller_manager/unspawner.py
@mergify mergify bot added the conflicts label Oct 30, 2023
Comment on lines 31 to 36
<<<<<<< HEAD
=======
parser.add_argument("controller_names", help="Name of the controller", nargs="+")
>>>>>>> 4e78813 (Update spawner to accept controllers list and start them in sequence (#1139))
parser.add_argument(
'controller_name', help='Name of the controller')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<<<<<<< HEAD
=======
parser.add_argument("controller_names", help="Name of the controller", nargs="+")
>>>>>>> 4e78813 (Update spawner to accept controllers list and start them in sequence (#1139))
parser.add_argument(
'controller_name', help='Name of the controller')
parser.add_argument("controller_names", help="Name of the controller", nargs="+")

Comment on lines 189 to 200
<<<<<<< HEAD
prefixed_controller_name = controller_name
if controller_namespace:
prefixed_controller_name = controller_namespace + '/' + controller_name

node = Node('spawner_' + controller_name)
if not controller_manager_name.startswith('/'):
=======
node = Node("spawner_" + controller_names[0])

if not controller_manager_name.startswith("/"):
>>>>>>> 4e78813 (Update spawner to accept controllers list and start them in sequence (#1139))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<<<<<<< HEAD
prefixed_controller_name = controller_name
if controller_namespace:
prefixed_controller_name = controller_namespace + '/' + controller_name
node = Node('spawner_' + controller_name)
if not controller_manager_name.startswith('/'):
=======
node = Node("spawner_" + controller_names[0])
if not controller_manager_name.startswith("/"):
>>>>>>> 4e78813 (Update spawner to accept controllers list and start them in sequence (#1139))
node = Node("spawner_" + controller_names[0])
if not controller_manager_name.startswith("/"):

Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

There is a missing arg stopped, rest LGTM

controller_manager/controller_manager/spawner.py Outdated Show resolved Hide resolved
controller_manager/controller_manager/spawner.py Outdated Show resolved Hide resolved
controller_manager/controller_manager/spawner.py Outdated Show resolved Hide resolved
bmagyar and others added 2 commits November 3, 2023 20:07
Co-authored-by: Sai Kishor Kothakota <[email protected]>
Co-authored-by: Sai Kishor Kothakota <[email protected]>
@bmagyar
Copy link
Member

bmagyar commented Nov 3, 2023

good catch, thank you!

@bmagyar bmagyar merged commit 553d0a5 into humble Nov 4, 2023
1 check passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1139 branch November 4, 2023 08:05
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.

2 participants