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

Make LocalClient.cmd_iter_no_block() not block #24093

Merged
merged 2 commits into from May 25, 2015

Conversation

msteed
Copy link
Contributor

@msteed msteed commented May 22, 2015

Add an optional block parameter to LocalClient.get_iter_returns(). Pass block=False in cmd_iter_no_block() so it can yield when no returns are available. Fixes #23464,

Add an optional 'block' parameter to LocalClient.get_iter_returns().
Pass block=False in cmd_iter_no_block() so it can yield when no returns
are available. Fixes saltstack#23464
@jfindlay
Copy link
Contributor

@msteed, it looks like a test needs to be updated.

- In Batch.__gather_minions(), call cmd_iter() instead of
  cmd_iter_no_block(), since the effect was to block inside
  __gather_minions() anyway, and the timeout was already being passed to
  cmd_iter()

- Tidy up some docstrings
@msteed
Copy link
Contributor Author

msteed commented May 23, 2015

@jfindlay, thanks. The test was right; I had introduced a bug.

@rallytime
Copy link
Contributor

Nice!

rallytime pushed a commit that referenced this pull request May 25, 2015
Make LocalClient.cmd_iter_no_block() not block
@rallytime rallytime merged commit 39a8f30 into saltstack:2014.7 May 25, 2015
@msteed msteed deleted the issue-23464 branch May 27, 2015 19:46
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.

None yet

3 participants