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 service call timeout argument in spawner (backport #1808) #1886

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2024

This PR exposes the call_timeout of the spawner to be optionally set by the user


This is an automatic backport of pull request #1808 done by Mergify.

Copy link
Contributor Author

mergify bot commented Nov 25, 2024

Cherry-pick of 41d7393 has failed:

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

You are currently cherry-picking commit 41d7393.
  (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/controller_manager/spawner.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/controller_manager_services.py
	both modified:   controller_manager/doc/userdoc.rst
	both modified:   doc/release_notes.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Nov 25, 2024
---------

Signed-off-by: Angsa Deployment Team <[email protected]>
Signed-off-by: Tony Najjar <[email protected]>
Co-authored-by: Angsa Deployment Team <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
Co-authored-by: Sai Kishor Kothakota <[email protected]>
Copy link

codecov bot commented Nov 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.93%. Comparing base (38a5600) to head (298cffa).
Report is 1 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1886      +/-   ##
==========================================
- Coverage   62.95%   62.93%   -0.02%     
==========================================
  Files         109      109              
  Lines       12493    12495       +2     
  Branches     8481     8480       -1     
==========================================
- Hits         7865     7864       -1     
- Misses        845      847       +2     
- Partials     3783     3784       +1     
Flag Coverage Δ
unittests 62.93% <100.00%> (-0.02%) ⬇️

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

Files with missing lines Coverage Δ
.../controller_manager/controller_manager_services.py 81.81% <100.00%> (ø)
controller_manager/controller_manager/spawner.py 69.85% <100.00%> (+0.44%) ⬆️

... and 1 file with indirect coverage changes

Copy link
Contributor Author

mergify bot commented Dec 3, 2024

This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

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.

LGTM

@christophfroehlich christophfroehlich merged commit 1738050 into humble Dec 16, 2024
12 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1808 branch December 16, 2024 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants